Toggle avatar color when window activation changes.

chrome/browser/ui/views/frame/browser_non_client_frame_view.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/ui/views/frame/browser_non_client_frame_view.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 13 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/resources/grit/views_resources.h"
 
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
 BrowserNonClientFrameView::BrowserNonClientFrameView(BrowserFrame* frame,
                                                      BrowserView* browser_view)
     : frame_(frame),
-      browser_view_(browser_view) {
+      browser_view_(browser_view),
+      observer_(this) {

[sky, 2016/03/17 21:00:31]

Feels wrong to have an observer on Widget when there is such a close
relationship between this class and Widget already. I would rather you add a
function to NonClientFrameView that OnNativeWidgetActivationChanged calls.

[Peter Kasting, 2016/03/17 23:14:10]

Done.

   // The profile manager may by null in tests.
   if (g_browser_process->profile_manager()) {
     g_browser_process->profile_manager()->
         GetProfileAttributesStorage().AddObserver(this);
   }
 }
 
 BrowserNonClientFrameView::~BrowserNonClientFrameView() {
   // The profile manager may by null in tests.
   if (g_browser_process->profile_manager()) {
     g_browser_process->profile_manager()->
         GetProfileAttributesStorage().RemoveObserver(this);
   }
 }
 
 void BrowserNonClientFrameView::OnBrowserViewInitViewsComplete() {}
 
 gfx::ImageSkia BrowserNonClientFrameView::GetOTRAvatarIcon() const {
   if (!ui::MaterialDesignController::IsModeMaterial())
     return *GetThemeProviderForProfile()->GetImageSkiaNamed(IDR_OTR_ICON);
-  SkColor icon_color = SK_ColorWHITE;
-#if defined(OS_WIN)
-  // On Windows 10+, we assume the native frame color is white.
-  // TODO(pkasting): Read the correct frame color from the registry or APIs.
-  if (GetWidget() && GetWidget()->ShouldUseNativeFrame() &&
-      (base::win::GetVersion() >= base::win::VERSION_WIN10))
-    icon_color = gfx::kChromeIconGrey;
-#endif
+  const SkColor icon_color = color_utils::PickContrastingColor(
+      SK_ColorWHITE, gfx::kChromeIconGrey, GetFrameColor());
   return gfx::CreateVectorIcon(gfx::VectorIconId::INCOGNITO, 24, icon_color);
 }
 
 void BrowserNonClientFrameView::UpdateToolbar() {
 }
 
 views::View* BrowserNonClientFrameView::GetLocationIconView() const {
   return nullptr;
 }
 
@@ skipping 12 matching lines @@
 }
 
 bool BrowserNonClientFrameView::ShouldPaintAsThemed() const {
   return browser_view_->IsBrowserTypeNormal();
 }
 
 SkColor BrowserNonClientFrameView::GetFrameColor(bool active) const {
   ThemeProperties::OverwritableByUserThemeProperty color_id =
       active ? ThemeProperties::COLOR_FRAME
              : ThemeProperties::COLOR_FRAME_INACTIVE;
-  return ShouldPaintAsThemed() ? GetThemeProvider()->GetColor(color_id)
-                               : ThemeProperties::GetDefaultColor(
-                                     color_id, browser_view_->IsOffTheRecord());
+  return ShouldPaintAsThemed() ?
+      GetThemeProviderForProfile()->GetColor(color_id) :
+      ThemeProperties::GetDefaultColor(color_id,
+                                       browser_view_->IsOffTheRecord());
 }
 
 gfx::ImageSkia BrowserNonClientFrameView::GetFrameImage(bool active) const {
   const ui::ThemeProvider* tp = frame_->GetThemeProvider();
   int frame_image_id = active ? IDR_THEME_FRAME : IDR_THEME_FRAME_INACTIVE;
 
   // |default_uses_color| means the default frame is painted with a solid color.
   // When false, the default frame is painted with assets.
 #if defined(OS_CHROMEOS)
   bool default_uses_color = true;
@@ skipping 69 matching lines @@
 
   // Disable the menu when we should not show the menu.
   if (avatar_button_ && !AvatarMenu::ShouldShowAvatarMenu())
     avatar_button_->SetEnabled(false);
   if (avatar_button_)
     avatar_button_->SetAvatarIcon(avatar, is_rectangle);
 }
 
 void BrowserNonClientFrameView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
-  if (details.is_add && details.child == this)
+  if (details.is_add && details.child == this) {
+    if (ui::MaterialDesignController::IsModeMaterial())
+      observer_.Add(GetWidget());
     UpdateAvatar();
+  }
+}
+
+// TODO(pkasting): This probably isn't needed, I bet the widget is guaranteed to
+// outlive us.
+void BrowserNonClientFrameView::OnWidgetDestroyed(views::Widget* widget) {
+  observer_.Remove(widget);
+}
+
+void BrowserNonClientFrameView::OnWidgetActivationChanged(views::Widget* widget,
+                                                          bool active) {
+  // On Windows, while deactivating the widget, this is called before the active
+  // HWND has actually been changed.  Since we want the avatar state to reflect
+  // that the window is inactive, we force NonClientFrameView to see the
+  // "correct" state as an override.
+  set_active_state_override(&active);
+  UpdateAvatar();
+  set_active_state_override(nullptr);
 }
 
 void BrowserNonClientFrameView::OnProfileAdded(
     const base::FilePath& profile_path) {
   OnProfileAvatarChanged(profile_path);
 }
 
 void BrowserNonClientFrameView::OnProfileWasRemoved(
     const base::FilePath& profile_path,
     const base::string16& profile_name) {
@@ skipping 40 matching lines @@
       const ProfileAttributesStorage& storage =
           g_browser_process->profile_manager()->GetProfileAttributesStorage();
       show_decoration = show_decoration && storage.GetNumberOfProfiles() > 1;
     }
     chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(),
         show_decoration
             ? (taskbar_badge_avatar.IsEmpty() ? &avatar : &taskbar_badge_avatar)
             : nullptr);
   }
 }