Several background pattern fixes on the Mac....

chrome/browser/cocoa/browser_window_controller.mm

 // Copyright (c) 2009 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 <Carbon/Carbon.h>
 
 #include "base/mac_util.h"
 #include "base/scoped_nsdisable_screen_updates.h"
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
@@ skipping 33 matching lines @@
 
 namespace {
 
 // Size of the gradient. Empirically determined so that the gradient looks
 // like what the heuristic does when there are just a few tabs.
 const int kWindowGradientHeight = 24;
 
 }
 
 @interface GTMTheme (BrowserThemeProviderInitialization)
-+ (GTMTheme *)themeWithBrowserThemeProvider:(BrowserThemeProvider*)provider
-                             isOffTheRecord:(BOOL)offTheRecord;
++ (GTMTheme*)themeWithBrowserThemeProvider:(BrowserThemeProvider*)provider
+                            isOffTheRecord:(BOOL)offTheRecord;
 @end
 
 @interface NSWindow (NSPrivateApis)
 // Note: These functions are private, use -[NSObject respondsToSelector:]
 // before calling them.
 
 - (void)setAutorecalculatesContentBorderThickness:(BOOL)b
                                           forEdge:(NSRectEdge)e;
 - (void)setContentBorderThickness:(CGFloat)b forEdge:(NSRectEdge)e;
 
 - (void)setBottomCornerRounded:(BOOL)rounded;
 
 - (NSRect)_growBoxRect;
 
 @end
 
 
 @interface BrowserWindowController(Private)
 
-// Leopard's gradient heuristic gets confused by our tabs and makes the title
-// gradient jump when creating a tab that is less than a tab width from the
-// right side of the screen. This function disables Leopard's gradient
-// heuristic.
-- (void)fixWindowGradient;
-
 // Saves the window's position in the local state preferences.
 - (void)saveWindowPositionIfNeeded;
 
 // Saves the window's position to the given pref service.
 - (void)saveWindowPositionToPrefs:(PrefService*)prefs;
 
 // We need to adjust where sheets come out of the window, as by default they
 // erupt from the omnibox, which is rather weird.
 - (NSRect)window:(NSWindow*)window
 willPositionSheet:(NSWindow*)sheet
        usingRect:(NSRect)defaultSheetRect;
 
 // Assign a theme to the window.
 - (void)setTheme;
 
-// Theme up the window.
-- (void)applyTheme;
-
 // Repositions the windows subviews.
 - (void)layoutSubviews;
 
 @end
 
 
 @implementation BrowserWindowController
 
 // Load the browser window nib and do any Cocoa-specific initialization.
 // Takes ownership of |browser|. Note that the nib also sets this controller
@@ skipping 110 matching lines @@
 
     if (browser_->SupportsWindowFeature(Browser::FEATURE_EXTENSIONSHELF)) {
       // Create the extension shelf.
       extensionShelfController_.reset([[ExtensionShelfController alloc]
                                         initWithBrowser:browser_.get()
                                          resizeDelegate:self]);
       [[[self window] contentView] addSubview:[extensionShelfController_ view]];
       [extensionShelfController_ wasInsertedIntoWindow];
     }
 
-    [self fixWindowGradient];
-
     // Force a relayout of all the various bars.
     [self layoutSubviews];
 
     // Create the bridge for the status bubble.
     statusBubble_.reset(new StatusBubbleMac([self window], self));
 
 #if 0
     // Move all buttons down two pixels for visual balance.
     // TODO(alcor): remove this if we can't prevent window resize from breaking.
     NSArray* buttons =
@@ skipping 90 matching lines @@
   }
 
   // the tab strip is empty, it's ok to close the window
   return YES;
 }
 
 // Called right after our window became the main window.
 - (void)windowDidBecomeMain:(NSNotification*)notification {
   BrowserList::SetLastActive(browser_.get());
   [self saveWindowPositionIfNeeded];
-  [self applyTheme];
+
+  // TODO(dmaclach): Instead of redrawing the whole window, views that care
+  // about the active window state should be registering for notifications.
+  [[self window] setViewsNeedDisplay:YES];
 }
 
 - (void)windowDidResignMain:(NSNotification*)notification {
-  [self applyTheme];
+  // TODO(dmaclach): Instead of redrawing the whole window, views that care
+  // about the active window state should be registering for notifications.
+  [[self window] setViewsNeedDisplay:YES];
 }
 
 // Called when we are activated (when we gain focus).
 - (void)windowDidBecomeKey:(NSNotification*)notification {
   // We need to activate the controls (in the "WebView"). To do this, get the
   // selected TabContents's RenderWidgetHostViewMac and tell it to activate.
   if (TabContents* contents = browser_->GetSelectedTabContents()) {
     if (RenderWidgetHostView* rwhv = contents->render_widget_host_view())
       rwhv->SetActive(true);
   }
@@ skipping 171 matching lines @@
     if (oldState != newState)
       [item setState:newState];
   }
 
   // Update the checked/Unchecked state of items in the encoding menu.
   // On Windows, this logic is part of |EncodingMenuModel| in
   // browser/views/toolbar_view.h.
   EncodingMenuController encoding_controller;
   if (encoding_controller.DoesCommandBelongToEncodingMenu(tag)) {
     DCHECK(browser_.get());
-    Profile *profile = browser_->profile();
+    Profile* profile = browser_->profile();
     DCHECK(profile);
     TabContents* current_tab = browser_->GetSelectedTabContents();
     if (!current_tab) {
       return;
     }
     const std::string encoding = current_tab->encoding();
 
     bool toggled = encoding_controller.IsItemChecked(profile, encoding, tag);
     NSInteger oldState = [item state];
     NSInteger newState = toggled ? NSOnState : NSOffState;
@@ skipping 198 matching lines @@
 // put into a different tab strip, such as during a drop on another window.
 - (void)detachTabView:(NSView*)view {
   int index = [tabStripController_ indexForTabView:view];
   browser_->tabstrip_model()->DetachTabContentsAt(index);
 }
 
 - (NSView*)selectedTabView {
   return [tabStripController_ selectedTabView];
 }
 
-- (TabStripController *)tabStripController {
+- (TabStripController*)tabStripController {
   return tabStripController_;
 }
 
 - (void)setIsLoading:(BOOL)isLoading {
   [toolbarController_ setIsLoading:isLoading];
 }
 
 // Make the location bar the first responder, if possible.
 - (void)focusLocationBar {
   [toolbarController_ focusLocationBar];
@@ skipping 248 matching lines @@
                        atIndex:(NSInteger)index
                    loadingOnly:(BOOL)loading {
   if (index == browser_->tabstrip_model()->selected_index()) {
     // Update titles if this is the currently selected tab.
     windowShim_->UpdateTitleBar();
   }
 }
 
 - (void)userChangedTheme {
   [self setTheme];
-  [self applyTheme];
+  NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
+  [defaultCenter postNotificationName:kGTMThemeDidChangeNotification
+                               object:theme_];
+  // TODO(dmaclach): Instead of redrawing the whole window, views that care
+  // about the active window state should be registering for notifications.
+  [[self window] setViewsNeedDisplay:YES];
 }
 
-- (GTMTheme *)gtm_themeForWindow:(NSWindow*)window {
+- (GTMTheme*)gtm_themeForWindow:(NSWindow*)window {
   return theme_ ? theme_ : [GTMTheme defaultTheme];
 }
 
+- (NSPoint)gtm_themePatternPhaseForWindow:(NSWindow*)window {
+  // Our patterns want to be drawn from the upper left hand corner of the view.
+  // Cocoa wants to do it from the lower left of the window.
+  // Rephase our pattern to fit this view. Some other views (Tabs, Toolbar etc.)
+  // will phase their patterns relative to this so all the views look right.
+  NSView* tabStripView = [self tabStripView];
+  NSRect tabStripViewWindowBounds = [tabStripView bounds];
+  NSView* windowChromeView = [[window contentView] superview];
+  tabStripViewWindowBounds =
+      [tabStripView convertRect:tabStripViewWindowBounds
+                         toView:windowChromeView];
+  NSPoint phase = NSMakePoint(NSMinX(tabStripViewWindowBounds),
+                              NSMinY(tabStripViewWindowBounds)
+                              + [TabStripController defaultTabHeight]);
+  return phase;
+}
+
 - (NSPoint)topLeftForBubble {
   NSRect rect = [toolbarController_ starButtonInWindowCoordinates];
   NSPoint p = NSMakePoint(NSMinX(rect), NSMinY(rect));  // bottom left
 
   // Adjust top-left based on our knowledge of how the view looks.
   p.x -= 2;
   p.y += 7;
 
   return p;
 }
@@ skipping 85 matching lines @@
   [shadow setShadowBlurRadius:2.0];
   [incognitoView setShadow:shadow];
 
   // Shrink the tab strip's width so there's no overlap and install the
   // view.
   tabFrame.size.width -= incognitoFrame.size.width + kOffset;
   [[self tabStripView] setFrame:tabFrame];
   [[[[self window] contentView] superview] addSubview:incognitoView.get()];
 }
 
-- (void)fixWindowGradient {
-  NSWindow* win = [self window];
-  if ([win respondsToSelector:@selector(
-          setAutorecalculatesContentBorderThickness:forEdge:)] &&
-      [win respondsToSelector:@selector(
-           setContentBorderThickness:forEdge:)]) {
-    [win setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
-    [win setContentBorderThickness:kWindowGradientHeight forEdge:NSMaxYEdge];
-  }
-}
-
 - (void)saveWindowPositionIfNeeded {
   if (browser_ != BrowserList::GetLastActive())
     return;
 
   if (!g_browser_process || !g_browser_process->local_state() ||
       !browser_->ShouldSaveWindowPlacement())
     return;
 
   [self saveWindowPositionToPrefs:g_browser_process->local_state()];
 }
@@ skipping 50 matching lines @@
 }
 
 - (id)windowWillReturnFieldEditor:(NSWindow*)sender toObject:(id)obj {
   // Ask the toolbar controller if it wants to return a custom field editor
   // for the specific object.
   return [toolbarController_ customFieldEditorForObject:obj];
 }
 
 - (void)setTheme {
   ThemeProvider* theme_provider = browser_->profile()->GetThemeProvider();
-  if (theme_provider) {
-    GTMTheme *theme = [GTMTheme themeWithBrowserThemeProvider:
-                        (BrowserThemeProvider *)theme_provider
-                          isOffTheRecord:browser_->profile()->IsOffTheRecord()];
+  BrowserThemeProvider* browser_theme_provider =
+     static_cast<BrowserThemeProvider*>(theme_provider);
+  if (browser_theme_provider) {
+    bool offtheRecord = browser_->profile()->IsOffTheRecord();
+    GTMTheme* theme =
+        [GTMTheme themeWithBrowserThemeProvider:browser_theme_provider
+                                 isOffTheRecord:offtheRecord];
     theme_.reset([theme retain]);
   }
 }
 
-- (void)applyTheme {
-  NSColor* color =
-      [theme_ backgroundPatternColorForStyle:GTMThemeStyleWindow
-                                       state:[[self window] isMainWindow]];
-  [[self window] setBackgroundColor:color];
-  [tabStripController_ applyTheme];
-}
-
 // Private method to layout browser window subviews.  Positions the toolbar and
 // the infobar above the tab content area.  Positions the download shelf below
 // the tab content area.  If the toolbar is not a child of the contentview, this
 // method will not leave room for it.  If we are currently running in fullscreen
 // mode, or if the tabstrip is not a descendant of the window, this method fills
 // the entire content area.  Otherwise, this method places the topmost view
 // directly beneath the tabstrip.
 - (void)layoutSubviews {
   NSView* contentView = fullscreen_ ? [fullscreen_window_ contentView]
                                     : [[self window] contentView];
@@ skipping 98 matching lines @@
   BOOL bookmarkToolbarShowsDivider = [bookmarkBarController_ isAlwaysVisible];
   [[toolbarController_ backgroundGradientView]
       setShowsDivider:!bookmarkToolbarShowsDivider];
   [[bookmarkBarController_ backgroundGradientView]
       setShowsDivider:bookmarkToolbarShowsDivider];
 }
 
 @end
 
 @implementation GTMTheme (BrowserThemeProviderInitialization)
-+ (GTMTheme *)themeWithBrowserThemeProvider:(BrowserThemeProvider*)provider
-                             isOffTheRecord:(BOOL)isOffTheRecord {
++ (GTMTheme*)themeWithBrowserThemeProvider:(BrowserThemeProvider*)provider
+                            isOffTheRecord:(BOOL)isOffTheRecord {
   // First check if it's in the cache.
   // TODO(pinkerton): This might be a good candidate for a singleton.
   typedef std::pair<std::string, BOOL> ThemeKey;
   static std::map<ThemeKey, GTMTheme*> cache;
   ThemeKey key(provider->GetThemeID(), isOffTheRecord);
   GTMTheme* theme = cache[key];
   if (theme)
     return theme;
 
   theme = [[GTMTheme alloc] init];  // "Leak" it in the cache.
   cache[key] = theme;
 
   // TODO(pinkerton): Need to be able to theme the entire incognito window
   // http://crbug.com/18568 The hardcoding of the colors here will need to be
   // removed when that bug is addressed, but are here in order for things to be
   // usable in the meantime.
   if (isOffTheRecord) {
     NSColor* incognitoColor = [NSColor colorWithCalibratedRed:83/255.0
                                                         green:108.0/255.0
                                                          blue:140/255.0
                                                         alpha:1.0];
     [theme setBackgroundColor:incognitoColor];
     [theme setValue:[NSColor blackColor]
       forAttribute:@"textColor"
-             style:GTMThemeStyleToolBar
+             style:GTMThemeStyleTabBarSelected
              state:GTMThemeStateActiveWindow];
     [theme setValue:[NSColor blackColor]
       forAttribute:@"textColor"
              style:GTMThemeStyleTabBarDeselected
              state:GTMThemeStateActiveWindow];
     [theme setValue:[NSColor blackColor]
       forAttribute:@"textColor"
              style:GTMThemeStyleBookmarksBarButton
              state:GTMThemeStateActiveWindow];
     return theme;
   }
 
   NSImage* frameImage = provider->GetNSImageNamed(IDR_THEME_FRAME);
   NSImage* frameInactiveImage =
       provider->GetNSImageNamed(IDR_THEME_FRAME_INACTIVE);
 
   [theme setValue:frameImage
      forAttribute:@"backgroundImage"
             style:GTMThemeStyleWindow
             state:GTMThemeStateActiveWindow];
 
   NSColor* tabTextColor =
       provider->GetNSColor(BrowserThemeProvider::COLOR_TAB_TEXT);
   [theme setValue:tabTextColor
      forAttribute:@"textColor"
-            style:GTMThemeStyleToolBar
+            style:GTMThemeStyleTabBarSelected
             state:GTMThemeStateActiveWindow];
 
   NSColor* tabInactiveTextColor =
       provider->GetNSColor(BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT);
   [theme setValue:tabInactiveTextColor
      forAttribute:@"textColor"
             style:GTMThemeStyleTabBarDeselected
             state:GTMThemeStateActiveWindow];
 
   NSColor* bookmarkBarTextColor =
@@ skipping 58 matching lines @@
             style:GTMThemeStyleToolBar
             state:GTMThemeStateActiveWindow];
 
   NSColor* toolbarBackgroundColor =
       provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR);
   [theme setValue:toolbarBackgroundColor
      forAttribute:@"backgroundColor"
             style:GTMThemeStyleToolBar
             state:GTMThemeStateActiveWindow];
 
+  NSImage* frameOverlayImage =
+      provider->GetNSImageNamed(IDR_THEME_FRAME_OVERLAY);
+  if (frameOverlayImage) {
+    [theme setValue:frameOverlayImage
+       forAttribute:@"overlay"
+              style:GTMThemeStyleWindow
+              state:GTMThemeStateActiveWindow];
+  }
+
+  NSImage* frameOverlayInactiveImage =
+      provider->GetNSImageNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE);
+  if (frameOverlayInactiveImage) {
+    [theme setValue:frameOverlayInactiveImage
+       forAttribute:@"overlay"
+              style:GTMThemeStyleWindow
+              state:GTMThemeStateInactiveWindow];
+  }
+
   return theme;
 }
 @end
-