Merge pull request brave#20535 from brave/refresh_browser_window_them…

…e_colors Refresh browser UI
Afoxcute · Nov 1, 2023 · 8771908 · 8771908
2 parents e0c6212 + bff8632
commit 8771908
Show file tree

Hide file tree

Showing 54 changed files with 783 additions and 373 deletions.
diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
@@ -295,11 +295,17 @@ Or change later at <ph name="SETTINGS_EXTENIONS_LINK">$2<ex>brave://settings/ext
       <message name="IDS_PRIVATE_PROFILE_NAME" desc="The name given to the private profile. Displayed in the avatar menu bubble and button UI.">
         Private Window
       </message>
+      <message name="IDS_PRIVATE_AVATAR_BUTTON_LABEL" desc="The text label of private avatar button.">
+        Private
+      </message>
+      <message name="IDS_PRIVATE_AVATAR_BUTTON_LABEL_COUNT" desc="The text label of private avatar button with count">
+        Private <ph name="COUNT">$1</ph>
+      </message>
       <message name="IDS_TOR_AVATAR_BUTTON_LABEL" desc="The text label of tor avatar button.">
-        Tor
+        Private with Tor
       </message>
       <message name="IDS_TOR_AVATAR_BUTTON_LABEL_COUNT" desc="The text label of tor avatar button. with count">
-        Tor <ph name="COUNT">$1</ph>
+        Private with Tor <ph name="COUNT">$1</ph>
       </message>
       <message name="IDS_TOR_AVATAR_BUTTON_TOOLTIP_TEXT" desc="The tooltip text of tor avatar button.">
         This is a private window with Tor

diff --git a/app/theme/default_100_percent/brave/tor_window_frame_graphic.png b/app/theme/default_100_percent/brave/tor_window_frame_graphic.png
diff --git a/app/theme/default_200_percent/brave/tor_window_frame_graphic.png b/app/theme/default_200_percent/brave/tor_window_frame_graphic.png
diff --git a/app/vector_icons/sidebar_items_down_arrow.icon b/app/vector_icons/sidebar_items_down_arrow.icon
@@ -1,6 +1,10 @@
-CANVAS_DIMENSIONS, 24,
-MOVE_TO, 17, 10,
-R_LINE_TO, -5, 5,
-R_LINE_TO, -5, -5,
-R_H_LINE_TO, 10,
+CANVAS_DIMENSIONS, 16,
+MOVE_TO, 8.38f, 10.21f,
+R_ARC_TO, 0.53f, 0.53f, 0, 0, 1, -0.75f, 0,
+LINE_TO, 3.96f, 6.54f,
+R_ARC_TO, 0.53f, 0.53f, 0, 0, 1, 0.75f, -0.75f,
+LINE_TO, 8, 9.08f,
+R_LINE_TO, 3.29f, -3.29f,
+R_ARC_TO, 0.53f, 0.53f, 0, 0, 1, 0.75f, 0.75f,
+LINE_TO, 8.38f, 10.21f,
 CLOSE
diff --git a/app/vector_icons/sidebar_items_up_arrow.icon b/app/vector_icons/sidebar_items_up_arrow.icon
@@ -1,6 +1,10 @@
-CANVAS_DIMENSIONS, 24,
-MOVE_TO, 7, 14,
-R_LINE_TO, 5, -5,
-R_LINE_TO, 5, 5,
-H_LINE_TO, 7,
+CANVAS_DIMENSIONS, 16,
+MOVE_TO, 7.62f, 5.79f,
+R_ARC_TO, 0.53f, 0.53f, 0, 0, 1, 0.75f, 0,
+R_LINE_TO, 3.67f, 3.67f,
+R_ARC_TO, 0.53f, 0.53f, 0, 1, 1, -0.75f, 0.76f,
+LINE_TO, 8, 6.92f,
+R_LINE_TO, -3.29f, 3.29f,
+R_ARC_TO, 0.53f, 0.53f, 0, 0, 1, -0.75f, -0.75f,
+LINE_TO, 7.62f, 5.79f,
 CLOSE
diff --git a/browser/themes/brave_theme_service_browsertest.cc b/browser/themes/brave_theme_service_browsertest.cc
@@ -212,14 +212,13 @@ IN_PROC_BROWSER_TEST_F(BraveThemeServiceTest, SystemThemeChangeTest) {
 
 IN_PROC_BROWSER_TEST_F(BraveThemeServiceTest, OmniboxColorTest) {
   auto* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
-  const int hovered = false;
 
   // Change to light.
   dark_mode::SetBraveDarkModeType(
       dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT);
   bool dark = false;
   auto* color_provider = browser_view->GetColorProvider();
-  EXPECT_EQ(GetLocationBarBackground(dark, false /* incognito */, hovered),
+  EXPECT_EQ(GetLocationBarBackground(dark, false /* incognito */),
             color_provider->GetColor(kColorToolbarBackgroundSubtleEmphasis));
   EXPECT_EQ(GetOmniboxResultBackground(kColorOmniboxResultsBackground, dark,
                                        false /* incognito */),
@@ -230,10 +229,10 @@ IN_PROC_BROWSER_TEST_F(BraveThemeServiceTest, OmniboxColorTest) {
       dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK);
   dark = true;
   color_provider = browser_view->GetColorProvider();
-  EXPECT_EQ(GetLocationBarBackground(dark, false /* incognito */, hovered),
+  EXPECT_EQ(GetLocationBarBackground(dark, false /* incognito */),
             color_provider->GetColor(kColorToolbarBackgroundSubtleEmphasis));
   // Check color is different on dark mode and incognito mode.
-  EXPECT_NE(GetLocationBarBackground(dark, true /* incognito */, hovered),
+  EXPECT_NE(GetLocationBarBackground(dark, true /* incognito */),
             color_provider->GetColor(kColorToolbarBackgroundSubtleEmphasis));
 
   EXPECT_EQ(GetOmniboxResultBackground(kColorOmniboxResultsBackground, dark,

diff --git a/browser/ui/brave_layout_constants.cc b/browser/ui/brave_layout_constants.cc
@@ -34,6 +34,8 @@ absl::optional<int> GetBraveLayoutConstant(LayoutConstant constant) {
     case TAB_SEPARATOR_HEIGHT: {
       return 24;
     }
+    case LOCATION_BAR_HEIGHT:
+      return touch ? 36 : 34;
     default:
       break;
   }

diff --git a/browser/ui/color/brave_color_id.h b/browser/ui/color/brave_color_id.h
@@ -12,20 +12,22 @@
 
 // clang-format off
 
-#define BRAVE_COMMON_COLOR_IDS                  \
-    E_CPONLY(kColorForTest)                     \
-    E_CPONLY(kColorIconBase)                    \
-    E_CPONLY(kColorMenuItemSubText)             \
-    E_CPONLY(kColorBookmarkBarInstructionsText) \
-    E_CPONLY(kColorLocationBarFocusRing)        \
-    E_CPONLY(kColorDialogDontAskAgainButton)    \
-    E_CPONLY(kColorDialogDontAskAgainButtonHovered) \
-    E_CPONLY(kColorWebDiscoveryInfoBarBackground)   \
-    E_CPONLY(kColorWebDiscoveryInfoBarMessage)      \
-    E_CPONLY(kColorWebDiscoveryInfoBarLink)         \
-    E_CPONLY(kColorWebDiscoveryInfoBarNoThanks)     \
-    E_CPONLY(kColorWebDiscoveryInfoBarClose)        \
-    E_CPONLY(kColorBraveDownloadToolbarButtonActive)
+#define BRAVE_COMMON_COLOR_IDS                       \
+    E_CPONLY(kColorForTest)                          \
+    E_CPONLY(kColorIconBase)                         \
+    E_CPONLY(kColorMenuItemSubText)                  \
+    E_CPONLY(kColorBookmarkBarInstructionsText)      \
+    E_CPONLY(kColorLocationBarFocusRing)             \
+    E_CPONLY(kColorLocationBarHoveredShadow)         \
+    E_CPONLY(kColorDialogDontAskAgainButton)         \
+    E_CPONLY(kColorDialogDontAskAgainButtonHovered)  \
+    E_CPONLY(kColorWebDiscoveryInfoBarBackground)    \
+    E_CPONLY(kColorWebDiscoveryInfoBarMessage)       \
+    E_CPONLY(kColorWebDiscoveryInfoBarLink)          \
+    E_CPONLY(kColorWebDiscoveryInfoBarNoThanks)      \
+    E_CPONLY(kColorWebDiscoveryInfoBarClose)         \
+    E_CPONLY(kColorBraveDownloadToolbarButtonActive) \
+    E_CPONLY(kColorToolbarButtonActivated)
 
 #define BRAVE_SEARCH_CONVERSION_COLOR_IDS                             \
     E_CPONLY(kColorSearchConversionCloseButton)                       \
@@ -52,7 +54,6 @@
     E_CPONLY(kColorSidebarArrowNormal)                        \
     E_CPONLY(kColorSidebarButtonBase)                         \
     E_CPONLY(kColorSidebarButtonPressed)                      \
-    E_CPONLY(kColorSidebarItemBackgroundHovered)              \
     E_CPONLY(kColorSidebarItemDragIndicator)                  \
     E_CPONLY(kColorSidebarSeparator)                          \
     E_CPONLY(kColorSidebarPanelHeaderSeparator)               \
@@ -103,7 +104,6 @@
     E_CPONLY(kColorBraveVerticalTabSeparator)           \
     E_CPONLY(kColorBraveVerticalTabActiveBackground)    \
     E_CPONLY(kColorBraveVerticalTabInactiveBackground)  \
-    E_CPONLY(kColorBraveVerticalTabHeaderButtonColor)   \
     E_CPONLY(kColorBraveVerticalTabNTBIconColor)        \
     E_CPONLY(kColorBraveVerticalTabNTBTextColor)        \
     E_CPONLY(kColorBraveVerticalTabNTBShortcutTextColor)