Set the Ash browser frame color for MD WebUI (Settings)

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

Index: 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 4735f87508e850b2daa888d704de4d562b559303..8db622dd724a3a5ef1e99d6d9766536d22f59fce 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
@@ -15,6 +15,7 @@
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "base/feature_list.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ -30,8 +31,10 @@
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/browser/web_applications/web_app.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/browser/web_contents.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
@@ -60,6 +63,8 @@ const int kTabstripRightSpacing = 10;
 // to hit easily.
 const int kTabShadowHeight = 4;
 
+const SkColor kMdWebUIFrameColor = SkColorSetRGB(0x25, 0x4f, 0xae);

[sky, 2017/02/03 00:38:32]

I'm surprised this color isn't common with other places. Is that right? It looks
like this is only used for packaged apps, could you name it like that too? Also,
use constexpr.

[stevenjb, 2017/02/03 01:52:43]

It's actually just for trusted source tabless browser windows, i.e. WebUI.
Specifically this is for Settings which is still the only WebUI with a dedicated
window. If that ever changes and UX wants different colors, we can cross that
bridge when we get there; I am not aware of any desire to do that for anything
except Settings.

I switched all of these to use constexpr.

+
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -100,6 +105,11 @@ void BrowserNonClientFrameViewAsh::Init() {
     header_painter->Init(frame(), this, caption_button_container_);
     if (window_icon_)
       header_painter->UpdateLeftHeaderView(window_icon_);
+    if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
+      // For non app (i.e. WebUI) windows (e.g. Settings) use MD frame color.
+      if (!browser_view()->browser()->is_app())
+        header_painter->SetFrameColors(kMdWebUIFrameColor, kMdWebUIFrameColor);

[sky, 2017/02/03 00:38:32]

Are we really using the same color for active and inactive?

[stevenjb, 2017/02/03 01:52:43]

I wasn't provided an inactive color, and currently we don't differentiate  for
Settings. I will verify that in the issue.

+    }
   } else {
     BrowserHeaderPainterAsh* header_painter = new BrowserHeaderPainterAsh;
     header_painter_.reset(header_painter);