Updates to clean up default theme and add hover states

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 78 matching lines @@
        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
 // up as the window's delegate.
 - (id)initWithBrowser:(Browser*)browser {
   return [self initWithBrowser:browser takeOwnership:YES];
@@ skipping 811 matching lines @@
                    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];
-
-  [tabStripController_ userChangedTheme];
 }
 
 - (GTMTheme *)gtm_themeForWindow:(NSWindow*)window {
   return theme_ ? theme_ : [GTMTheme defaultTheme];
 }
 
 - (NSPoint)topLeftForBubble {
   NSRect rect = [toolbarController_ starButtonInWindowCoordinates];
   NSPoint p = NSMakePoint(NSMinX(rect), NSMinY(rect));  // bottom left
 
@@ skipping 184 matching lines @@
                           isOffTheRecord:browser_->profile()->IsOffTheRecord()];
     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 {
@@ skipping 76 matching lines @@
     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:YES];
+            state:GTMThemeStateActiveWindow];
 
-  NSColor* tabTextColor = [NSColor blackColor];
+  NSColor* tabTextColor =
+      provider->GetNSColor(BrowserThemeProvider::COLOR_TAB_TEXT);
   [theme setValue:tabTextColor
      forAttribute:@"textColor"
             style:GTMThemeStyleToolBar
-            state:YES];
+            state:GTMThemeStateActiveWindow];
 
-  NSColor* tabInactiveTextColor = [NSColor grayColor];
+  NSColor* tabInactiveTextColor =
+      provider->GetNSColor(BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT);
   [theme setValue:tabInactiveTextColor
      forAttribute:@"textColor"
-            style:GTMThemeStyleToolBar
-            state:NO];
+            style:GTMThemeStyleTabBarDeselected
+            state:GTMThemeStateActiveWindow];
 
-  NSColor* bookmarkBarTextColor = [NSColor blackColor];
+  NSColor* bookmarkBarTextColor =
+      provider->GetNSColor(BrowserThemeProvider::COLOR_BOOKMARK_TEXT);
   [theme setValue:bookmarkBarTextColor
      forAttribute:@"textColor"
             style:GTMThemeStyleBookmarksBarButton
-            state:YES];
+            state:GTMThemeStateActiveWindow];
 
   [theme setValue:frameInactiveImage
      forAttribute:@"backgroundImage"
             style:GTMThemeStyleWindow
-            state:NO];
+            state:0];
 
   NSImage* toolbarImage = provider->GetNSImageNamed(IDR_THEME_TOOLBAR);
   [theme setValue:toolbarImage
      forAttribute:@"backgroundImage"
             style:GTMThemeStyleToolBar
-            state:YES];
+            state:GTMThemeStateActiveWindow];
+  NSImage* toolbarBackgroundImage =
+      provider->GetNSImageNamed(IDR_THEME_TAB_BACKGROUND);
+  [theme setValue:toolbarBackgroundImage
+     forAttribute:@"backgroundImage"
+            style:GTMThemeStyleTabBarDeselected
+            state:GTMThemeStateActiveWindow];
 
   NSImage* toolbarButtonImage =
       provider->GetNSImageNamed(IDR_THEME_BUTTON_BACKGROUND);
   if (toolbarButtonImage) {
     [theme setValue:toolbarButtonImage
      forAttribute:@"backgroundImage"
             style:GTMThemeStyleToolBarButton
-            state:YES];
+            state:GTMThemeStateActiveWindow];
   } else {
     NSColor* startColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.0];
     NSColor* endColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.3];
     scoped_nsobject<NSGradient> gradient([[NSGradient alloc]
                                           initWithStartingColor:startColor
                                                     endingColor:endColor]);
 
     [theme setValue:gradient
        forAttribute:@"gradient"
               style:GTMThemeStyleToolBarButton
-              state:YES];
+              state:GTMThemeStateActiveWindow];
 
     [theme setValue:gradient
        forAttribute:@"gradient"
               style:GTMThemeStyleToolBarButton
-              state:NO];
+              state:GTMThemeStateActiveWindow];
   }
 
   NSColor* toolbarButtonIconColor =
       provider->GetNSColorTint(BrowserThemeProvider::TINT_BUTTONS);
   [theme setValue:toolbarButtonIconColor
      forAttribute:@"iconColor"
             style:GTMThemeStyleToolBarButton
-            state:YES];
+            state:GTMThemeStateActiveWindow];
 
   NSColor* toolbarButtonBorderColor = toolbarButtonIconColor;
   [theme setValue:toolbarButtonBorderColor
      forAttribute:@"borderColor"
             style:GTMThemeStyleToolBar
-            state:YES];
+            state:GTMThemeStateActiveWindow];
+
+  NSColor* toolbarBackgroundColor =
+      provider->GetNSColor(BrowserThemeProvider::COLOR_TOOLBAR);
+  [theme setValue:toolbarBackgroundColor
+     forAttribute:@"backgroundColor"
+            style:GTMThemeStyleToolBar
+            state:GTMThemeStateActiveWindow];
 
   return theme;
 }
 @end