Mac: Make it easier for views to correctly draw with a theme.

chrome/browser/ui/cocoa/background_gradient_view.mm

 // 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/cocoa/background_gradient_view.h"
 
 #import "chrome/browser/themes/theme_properties.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "grit/theme_resources.h"
@@ skipping 93 matching lines @@
   if (!isActive && themeProvider->UsingDefaultTheme()) {
     NSColor* color = themeProvider->GetNSImageColorNamed(
         IDR_THEME_TOOLBAR_INACTIVE);
     if (color)
       return color;
   }
 
   return themeProvider->GetNSImageColorNamed(IDR_THEME_TOOLBAR);
 }
 
-- (void)windowFocusDidChange:(NSNotification*)notification {
-  // Some child views will indirectly use BackgroundGradientView by calling an
-  // ancestor's draw function (e.g, BookmarkButtonView). Call setNeedsDisplay
-  // on all descendants to ensure that these views re-draw.
-  // TODO(ccameron): Enable these views to listen for focus notifications
-  // directly.
-  [self cr_recursivelySetNeedsDisplay:YES];
-}
-
-- (void)viewWillMoveToWindow:(NSWindow*)window {
+- (void)viewDidMoveToWindow {

[Andre, 2015/02/03 19:20:37]

Views usually call [[self window] isMainWindow] when drawing.
It seems better to call setNeedsDisplay after [self window] has been set.

+  [super viewDidMoveToWindow];
   if ([self window]) {
-    [[NSNotificationCenter defaultCenter]
-        removeObserver:self
-                  name:NSWindowDidBecomeKeyNotification
-                object:[self window]];
-    [[NSNotificationCenter defaultCenter]
-        removeObserver:self
-                  name:NSWindowDidBecomeMainNotification
-                object:[self window]];
-  }
-  if (window) {
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-           selector:@selector(windowFocusDidChange:)
-               name:NSWindowDidBecomeMainNotification
-             object:window];
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-           selector:@selector(windowFocusDidChange:)
-               name:NSWindowDidResignMainNotification
-             object:window];
     // The new window for the view may have a different focus state than the
     // last window this view was part of. Force a re-draw to ensure that the
     // view draws the right state.
-    [self windowFocusDidChange:nil];
+    [self windowDidChangeActive];
   }
-  [super viewWillMoveToWindow:window];
 }
 
 - (void)setFrameOrigin:(NSPoint)origin {
   // The background color depends on the view's vertical position. This impacts
   // any child views that draw using this view's functions.
   if (NSMinY([self frame]) != origin.y)
     [self cr_recursivelySetNeedsDisplay:YES];
 
   [super setFrameOrigin:origin];
 }
 
+// ThemedWindowDrawing implementation.
+
+- (void)windowDidChangeTheme {
+  [self setNeedsDisplay:YES];
+}
+
+- (void)windowDidChangeActive {
+  [self setNeedsDisplay:YES];
+}
+
 @end