commit da2de79f921d4602a1c0049881ef87b5a7814d6a
author Regan Hsu <hsuregan@chromium.org> Tue Apr 23 18:08:26 2019
committer Commit Bot <commit-bot@chromium.org> Tue Apr 23 18:08:26 2019
tree 289cb5cd576358f9aed35c05e25a561f194bf28e
parent 2e64da33d3b360fcfe6da427a0a284ca645bbe9b

[CrOS SplitSettings] Change color of title bar of OS Settings.

This CL changes the color of the title bar (which excludes the webui).

Bug: 950007
Change-Id: I9cdcc27ce9ba7a4f9f49363f114f1b0f802dfeb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1578239
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653266}

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index cf670e9..836c67a 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -43,6 +43,7 @@
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
+#include "chromeos/constants/chromeos_features.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"
@@ -58,6 +59,7 @@
 #include "ui/base/ui_base_features.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/views/controls/label.h"
@@ -74,7 +76,10 @@
 
 // The color used for the frame when showing a non-tabbed WebUI, such as
 // the Settings window.
+// TODO(hsuregan): Replace kMdWebUiFrameColor's value with
+// kUpdatedMdWebUiFrameColor's value once complete.
 constexpr SkColor kMdWebUiFrameColor = SkColorSetARGB(0xff, 0x25, 0x4f, 0xae);
+constexpr SkColor kUpdatedMdWebUiFrameColor = gfx::kGoogleGrey100;
 
 // Color for the window title text.
 constexpr SkColor kNormalWindowTitleTextColor = SkColorSetRGB(40, 40, 40);
@@ -812,7 +817,10 @@
     active_color =
         browser_view()->browser()->web_app_controller()->GetThemeColor();
   } else if (!browser_view()->browser()->is_app()) {
-    active_color = kMdWebUiFrameColor;
+    active_color =
+        base::FeatureList::IsEnabled(chromeos::features::kSplitSettings)
+            ? kUpdatedMdWebUiFrameColor
+            : kMdWebUiFrameColor;
   }
 
   if (active_color) {