[Read Anything] Add colors for dropdown colors based on figma mocks. Screenshot once connected with RA: https://screenshot.googleplex.com/8M2ZpSYU9QTuUeZ.png Bug:1266555 Change-Id: Ie1e73e6430c9eafa913bd3151a9bdf14110231e6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4327414 Commit-Queue: Lauren Winston <lwinston@google.com> Reviewed-by: Abigail Klein <abigailbklein@google.com> Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org> Cr-Commit-Position: refs/heads/main@{#1115975}
diff --git a/chrome/browser/ui/color/chrome_color_id.h b/chrome/browser/ui/color/chrome_color_id.h index 6309c869..2b6a65c0 100644 --- a/chrome/browser/ui/color/chrome_color_id.h +++ b/chrome/browser/ui/color/chrome_color_id.h
@@ -508,6 +508,11 @@ E_CPONLY(kColorReadAnythingSeparatorDark) \ E_CPONLY(kColorReadAnythingSeparatorLight) \ E_CPONLY(kColorReadAnythingSeparatorYellow) \ + E_CPONLY(kColorReadAnythingDropdownBackground) \ + E_CPONLY(kColorReadAnythingDropdownBackgroundBlue) \ + E_CPONLY(kColorReadAnythingDropdownBackgroundDark) \ + E_CPONLY(kColorReadAnythingDropdownBackgroundLight) \ + E_CPONLY(kColorReadAnythingDropdownBackgroundYellow) \ #if BUILDFLAG(IS_CHROMEOS) #define CHROME_PLATFORM_SPECIFIC_COLOR_IDS \
diff --git a/chrome/browser/ui/color/chrome_color_mixer.cc b/chrome/browser/ui/color/chrome_color_mixer.cc index fe1605b..a49f318d 100644 --- a/chrome/browser/ui/color/chrome_color_mixer.cc +++ b/chrome/browser/ui/color/chrome_color_mixer.cc
@@ -678,6 +678,13 @@ mixer[kColorReadAnythingSeparatorYellow] = ui::PickGoogleColor( kColorReadAnythingForegroundLight, kColorReadAnythingBackgroundYellow, color_utils::kMinimumVisibleContrastRatio); + mixer[kColorReadAnythingDropdownBackground] = { + dark_mode ? kColorReadAnythingDropdownBackgroundDark + : kColorReadAnythingDropdownBackgroundLight}; + mixer[kColorReadAnythingDropdownBackgroundBlue] = {gfx::kGoogleBlue100}; + mixer[kColorReadAnythingDropdownBackgroundDark] = {gfx::kGoogleGrey900}; + mixer[kColorReadAnythingDropdownBackgroundLight] = {SK_ColorWHITE}; + mixer[kColorReadAnythingDropdownBackgroundYellow] = {gfx::kGoogleYellow050}; // Apply high contrast recipes if necessary. if (!ShouldApplyHighContrastColors(key)) {
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.cc b/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.cc index f2ecc1e..0c82155 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.cc +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.cc
@@ -81,6 +81,7 @@ ui::ColorId foreground_color_id, ui::ColorId background_color_id, ui::ColorId separator_color_id, + ui::ColorId dropdown_color_id, read_anything::mojom::LineSpacing line_spacing, read_anything::mojom::LetterSpacing letter_spacing) { separator_->SetColorId(separator_color_id);
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.h b/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.h index c597d612..55173ceb 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.h +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_container_view.h
@@ -46,6 +46,7 @@ ui::ColorId foreground_color_id, ui::ColorId background_color_id, ui::ColorId separator_color_id, + ui::ColorId dropdown_color_id, read_anything::mojom::LineSpacing line_spacing, read_anything::mojom::LetterSpacing letter_spacing) override;
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.cc b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.cc index a4c3215b..a95a2706 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.cc +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.cc
@@ -76,6 +76,7 @@ foreground_color_id_ = initial_colors.foreground_color_id; background_color_id_ = initial_colors.background_color_id; separator_color_id_ = initial_colors.separator_color_id; + dropdown_color_id_ = initial_colors.dropdown_color_id; line_spacing_ = line_spacing_model_->GetLineSpacingAt( line_spacing_model_->GetSelectedIndex().value()); @@ -113,6 +114,7 @@ foreground_color_id_ = new_colors.foreground_color_id; background_color_id_ = new_colors.background_color_id; separator_color_id_ = new_colors.separator_color_id; + dropdown_color_id_ = new_colors.dropdown_color_id; NotifyThemeChanged(); } @@ -189,9 +191,10 @@ void ReadAnythingModel::NotifyThemeChanged() { for (Observer& obs : observers_) { - obs.OnReadAnythingThemeChanged( - font_name_, font_scale_, foreground_color_id_, background_color_id_, - separator_color_id_, line_spacing_, letter_spacing_); + obs.OnReadAnythingThemeChanged(font_name_, font_scale_, + foreground_color_id_, background_color_id_, + separator_color_id_, dropdown_color_id_, + line_spacing_, letter_spacing_); } } @@ -283,6 +286,7 @@ kColorReadAnythingForeground, kColorReadAnythingBackground, kColorReadAnythingSeparator, + kColorReadAnythingDropdownBackground, ReadAnythingColor::kDefault}; ColorInfo kLightColors = { @@ -291,6 +295,7 @@ kColorReadAnythingForegroundLight, kColorReadAnythingBackgroundLight, kColorReadAnythingSeparatorLight, + kColorReadAnythingDropdownBackgroundLight, ReadAnythingColor::kLight}; ColorInfo kDarkColors = { @@ -299,6 +304,7 @@ kColorReadAnythingForegroundDark, kColorReadAnythingBackgroundDark, kColorReadAnythingSeparatorDark, + kColorReadAnythingDropdownBackgroundDark, ReadAnythingColor::kDark}; ColorInfo kYellowColors = { @@ -307,6 +313,7 @@ kColorReadAnythingForegroundYellow, kColorReadAnythingBackgroundYellow, kColorReadAnythingSeparatorYellow, + kColorReadAnythingDropdownBackgroundYellow, ReadAnythingColor::kYellow}; ColorInfo kBlueColors = { @@ -315,6 +322,7 @@ kColorReadAnythingForegroundBlue, kColorReadAnythingBackgroundBlue, kColorReadAnythingSeparatorBlue, + kColorReadAnythingDropdownBackgroundBlue, ReadAnythingColor::kBlue}; colors_choices_.emplace_back(kDefaultColors);
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.h b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.h index 86453b68..62c21c76 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.h +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.h
@@ -107,6 +107,9 @@ // toolbar. ui::ColorId separator_color_id; + // The color of the dropdown menu, used for the combobox menu model. + ui::ColorId dropdown_color_id; + // The enum value used to log this theme. ReadAnythingColorsModel::ReadAnythingColor logging_value; }; @@ -217,6 +220,7 @@ ui::ColorId foreground_color_id, ui::ColorId background_color_id, ui::ColorId separator_color_id, + ui::ColorId dropdown_color_id, read_anything::mojom::LineSpacing line_spacing, read_anything::mojom::LetterSpacing letter_spacing) = 0; #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) @@ -281,7 +285,10 @@ std::string font_name_ = string_constants::kReadAnythingDefaultFontName; ui::ColorId foreground_color_id_ = kColorReadAnythingForeground; ui::ColorId background_color_id_ = kColorReadAnythingBackground; + + // Additional theme colors. ui::ColorId separator_color_id_ = kColorReadAnythingSeparator; + ui::ColorId dropdown_color_id_ = kColorReadAnythingDropdownBackground; // A scale multiplier for font size (internal use only, not shown to user). float font_scale_ = kReadAnythingDefaultFontScale;
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model_unittest.cc b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model_unittest.cc index 26b8894..c6dc86d 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model_unittest.cc +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model_unittest.cc
@@ -39,6 +39,7 @@ ui::ColorId foreground_color_id, ui::ColorId background_color_id, ui::ColorId separator_color_id, + ui::ColorId dropdown_color_id, read_anything::mojom::LineSpacing line_spacing, read_anything::mojom::LetterSpacing letter_spacing), (override)); @@ -77,13 +78,13 @@ EXPECT_CALL(model_observer_1_, AccessibilityEventReceived(_)).Times(0); EXPECT_CALL(model_observer_1_, OnActiveAXTreeIDChanged(_, _)).Times(0); EXPECT_CALL(model_observer_1_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(1); EXPECT_CALL(model_observer_2_, AccessibilityEventReceived(_)).Times(0); EXPECT_CALL(model_observer_2_, OnActiveAXTreeIDChanged(_, _)).Times(0); EXPECT_CALL(model_observer_2_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(1); model_->AddObserver(&model_observer_2_); @@ -96,19 +97,19 @@ EXPECT_CALL(model_observer_1_, AccessibilityEventReceived(_)).Times(0); EXPECT_CALL(model_observer_1_, OnActiveAXTreeIDChanged(_, _)).Times(0); EXPECT_CALL(model_observer_1_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(1); EXPECT_CALL(model_observer_2_, AccessibilityEventReceived(_)).Times(0); EXPECT_CALL(model_observer_2_, OnActiveAXTreeIDChanged(_, _)).Times(0); EXPECT_CALL(model_observer_2_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(0); EXPECT_CALL(model_observer_3_, AccessibilityEventReceived(_)).Times(0); EXPECT_CALL(model_observer_3_, OnActiveAXTreeIDChanged(_, _)).Times(0); EXPECT_CALL(model_observer_3_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(1); model_->RemoveObserver(&model_observer_2_); @@ -119,7 +120,7 @@ model_->AddObserver(&model_observer_1_); EXPECT_CALL(model_observer_1_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(1); model_->SetSelectedFontByIndex(2); @@ -156,7 +157,7 @@ model_->AddObserver(&model_observer_1_); EXPECT_CALL(model_observer_1_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(1); model_->DecreaseTextSize(); @@ -168,7 +169,7 @@ model_->AddObserver(&model_observer_1_); EXPECT_CALL(model_observer_1_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(1); model_->IncreaseTextSize(); @@ -180,7 +181,7 @@ model_->AddObserver(&model_observer_1_); EXPECT_CALL(model_observer_1_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(1); model_->SetSelectedColorsByIndex(2); @@ -190,7 +191,7 @@ model_->AddObserver(&model_observer_1_); EXPECT_CALL(model_observer_1_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(1); model_->SetSelectedLineSpacingByIndex(2); @@ -200,7 +201,7 @@ model_->AddObserver(&model_observer_1_); EXPECT_CALL(model_observer_1_, - OnReadAnythingThemeChanged(_, _, _, _, _, _, _)) + OnReadAnythingThemeChanged(_, _, _, _, _, _, _, _)) .Times(1); model_->SetSelectedLetterSpacingByIndex(2);
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_toolbar_view.cc b/chrome/browser/ui/views/side_panel/read_anything/read_anything_toolbar_view.cc index 66a5ebc4..379069e6 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_toolbar_view.cc +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_toolbar_view.cc
@@ -155,6 +155,7 @@ ui::ColorId foreground_color_id, ui::ColorId background_color_id, ui::ColorId separator_color_id, + ui::ColorId dropdown_color_id, read_anything::mojom::LineSpacing line_spacing, read_anything::mojom::LetterSpacing letter_spacing) { if (!GetColorProvider()) @@ -188,6 +189,8 @@ letter_spacing_button_->SetIcon(kLetterSpacingIcon, kIconSize, foreground_skcolor); + // TODO(1266555): Pass the dropdown color to the combobox and menu models. + for (views::Separator* separator : separators_) { separator->SetColorId(separator_color_id); }
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_toolbar_view.h b/chrome/browser/ui/views/side_panel/read_anything/read_anything_toolbar_view.h index 0998266f..41d294b 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_toolbar_view.h +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_toolbar_view.h
@@ -61,6 +61,7 @@ ui::ColorId foreground_color_id, ui::ColorId background_color_id, ui::ColorId separator_color_id, + ui::ColorId dropdown_color_id, read_anything::mojom::LineSpacing line_spacing, read_anything::mojom::LetterSpacing letter_spacing) override;
diff --git a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.cc b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.cc index 58a3b34..66035f47 100644 --- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.cc +++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.cc
@@ -87,6 +87,7 @@ ui::ColorId foreground_color_id, ui::ColorId background_color_id, ui::ColorId separator_color_id, + ui::ColorId dropdown_color_id, read_anything::mojom::LineSpacing line_spacing, read_anything::mojom::LetterSpacing letter_spacing) { content::WebContents* web_contents = web_ui_->GetWebContents();
diff --git a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.h b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.h index a20422f..5f9ceda 100644 --- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.h +++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.h
@@ -72,6 +72,7 @@ ui::ColorId foreground_color_id, ui::ColorId background_color_id, ui::ColorId separator_color_id, + ui::ColorId dropdown_color_id, read_anything::mojom::LineSpacing line_spacing, read_anything::mojom::LetterSpacing letter_spacing) override; #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
