Monitor the system native frame color on Win 10.

chrome/browser/themes/theme_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_service.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 37 matching lines @@
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/browser/extension_registry_observer.h"
 #endif
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_theme.h"
 #endif
 
 #if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#include "skia/ext/skia_utils_win.h"
 #include "ui/base/win/shell.h"
 #endif
 
 using base::UserMetricsAction;
 using content::BrowserThread;
 using extensions::Extension;
 using extensions::UnloadedExtensionInfo;
 using ui::ResourceBundle;
 
 // The default theme if we haven't installed a theme yet or if we've clicked
@@ skipping 93 matching lines @@
 #endif  // defined(ENABLE_EXTENSIONS)
 
 ThemeService::ThemeService()
     : ready_(false),
       rb_(ResourceBundle::GetSharedInstance()),
       profile_(nullptr),
       installed_pending_load_id_(kDefaultThemeID),
       number_of_infobars_(0),
       original_theme_provider_(*this, false),
       incognito_theme_provider_(*this, true),
-      weak_ptr_factory_(this) {}
+      weak_ptr_factory_(this) {
+#if defined(OS_WIN)
+  // This just checks for Windows 10 instead of calling ShouldUseDwmFrameColor()
+  // because we want to monitor the frame color even when a custom frame is in
+  // use, so that it will be correct if at any time the user switches to the
+  // native frame.
+  if (base::win::GetVersion() >= base::win::VERSION_WIN10) {
+    dwm_key_.reset(new base::win::RegKey(
+        HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\DWM", KEY_READ));

[Bret, 2016/02/29 18:29:03]

Are you sure this is actually the frame color? When I messed around with this
earlier Windows would only report to me the base accent color (i.e. the color
you get when you pick the swatch from the settings page), not the actual color
it uses to draw an active frame. They're slightly different.

If you're not using this to actually draw the active frame this is probably
fine, but don't call it "frame color" because that's not quite correct.

[Peter Kasting, 2016/02/29 19:57:06]

On my system, the swatch color and the frame color are exactly the same for all
the swatches I tried (~9) and the color in the registry matched those for the
cases I looked at (~4).

If there's a particular problematic swatch on your system, let me know so I can
test it on mine.

+    OnDwmKeyUpdated();
+  }
+#endif
+}
 
 ThemeService::~ThemeService() {
   FreePlatformCaches();
 }
 
 void ThemeService::Init(Profile* profile) {
   DCHECK(CalledOnValidThread());
   profile_ = profile;
 
   LoadThemePrefs();
@@ skipping 286 matching lines @@
   SkColor color;
   if (theme_supplier_ && theme_supplier_->GetColor(theme_supplier_id, &color))
     return color;
 
   // For backward compat with older themes, some newer colors are generated from
   // older ones if they are missing.
   const int kNtpText = ThemeProperties::COLOR_NTP_TEXT;
   const int kLabelBackground =
       ThemeProperties::COLOR_SUPERVISED_USER_LABEL_BACKGROUND;
   switch (id) {
+#if defined(OS_WIN)
+    case ThemeProperties::COLOR_FRAME:
+    case ThemeProperties::COLOR_FRAME_INCOGNITO:
+      // Active native windows on Windows 10 may have a custom frame color.
+      if (ShouldUseDwmFrameColor())
+        return dwm_frame_color_;
+      break;
+    case ThemeProperties::COLOR_FRAME_INACTIVE:
+    case ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE:
+      // Inactive native windows on Windows 10 always have a white frame.
+      if (ShouldUseDwmFrameColor())
+        return SK_ColorWHITE;
+      break;
+#endif
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON:
       return color_utils::HSLShift(
           gfx::kChromeIconGrey,
           GetTint(ThemeProperties::TINT_BUTTONS, incognito));
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE:
       // The active color is overridden in Gtk2UI.
       return SkColorSetA(
           GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON, incognito),
           0x33);
     case ThemeProperties::COLOR_BACKGROUND_TAB: {
@@ skipping 243 matching lines @@
 #if defined(ENABLE_SUPERVISED_USERS)
 bool ThemeService::IsSupervisedUser() const {
   return profile_->IsSupervised();
 }
 
 void ThemeService::SetSupervisedUserTheme() {
   SetCustomDefaultTheme(new SupervisedUserTheme);
 }
 #endif
 
+#if defined(OS_WIN)
+bool ThemeService::ShouldUseDwmFrameColor() const {
+  return ShouldUseNativeFrame() &&
+         (base::win::GetVersion() >= base::win::VERSION_WIN10);
+}
+
+void ThemeService::OnDwmKeyUpdated() {
+  // Attempt to read the accent color.
+  DWORD accent_color, color_prevalence;
+  dwm_frame_color_ =
+      ((dwm_key_->ReadValueDW(L"ColorPrevalence", &color_prevalence) ==
+        ERROR_SUCCESS) &&
+       (color_prevalence == 1) &&
+       (dwm_key_->ReadValueDW(L"AccentColor", &accent_color) == ERROR_SUCCESS))
+          ? skia::COLORREFToSkColor(accent_color)
+          : SK_ColorWHITE;
+
+  // Watch for future changes.
+  if (!dwm_key_->StartWatching(
+          base::Bind(&ThemeService::OnDwmKeyUpdated, base::Unretained(this))))
+    dwm_key_.reset();
+}
+#endif
+
 void ThemeService::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes(false);
 }
@@ skipping 45 matching lines @@
 
 bool ThemeService::BrowserThemeProvider::HasCustomImage(int id) const {
   return theme_service_.HasCustomImage(id);
 }
 
 base::RefCountedMemory* ThemeService::BrowserThemeProvider::GetRawData(
     int id,
     ui::ScaleFactor scale_factor) const {
   return theme_service_.GetRawData(id, scale_factor);
 }