diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 21:43:25 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 21:43:25 +0000 |
| commit | e9210915326b600a7efc8aa6d1befba549347fe5 (patch) | |
| tree | 93b86527830652c00a602d1c324b3078257c1372 /chrome/browser/cocoa/download_shelf_view.mm | |
| parent | f9fc33227ea65b9b199a1fc7cc1055d362e5594a (diff) | |
| download | chromium_src-e9210915326b600a7efc8aa6d1befba549347fe5.zip chromium_src-e9210915326b600a7efc8aa6d1befba549347fe5.tar.gz chromium_src-e9210915326b600a7efc8aa6d1befba549347fe5.tar.bz2 | |
Removal of GTMTheme gradient use. Unthemed incognito windows now are fully drawn as they should be.
BUG=http://crbug.com/35554 ; http://crbug.com/26983
TEST=no visible change in normal mode; themed incognito windows should look almost correct (missing theme header)
Review URL: http://codereview.chromium.org/661097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/download_shelf_view.mm')
| -rw-r--r-- | chrome/browser/cocoa/download_shelf_view.mm | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/chrome/browser/cocoa/download_shelf_view.mm b/chrome/browser/cocoa/download_shelf_view.mm index 521ff33..4894442 100644 --- a/chrome/browser/cocoa/download_shelf_view.mm +++ b/chrome/browser/cocoa/download_shelf_view.mm @@ -5,22 +5,26 @@ #import "chrome/browser/cocoa/download_shelf_view.h" #include "base/scoped_nsobject.h" -#import "chrome/browser/cocoa/GTMTheme.h" +#include "chrome/browser/browser_theme_provider.h" +#import "chrome/browser/cocoa/themed_window.h" +#include "grit/theme_resources.h" @implementation DownloadShelfView - (NSColor*)strokeColor { - return [[self gtm_theme] strokeColorForStyle:GTMThemeStyleToolBar - state:[[self window] isKeyWindow]]; + BOOL isKey = [[self window] isKeyWindow]; + ThemeProvider* themeProvider = [[self window] themeProvider]; + return themeProvider->GetNSColor( + isKey ? BrowserThemeProvider::COLOR_TOOLBAR_STROKE : + BrowserThemeProvider::COLOR_TOOLBAR_STROKE_INACTIVE, true); } - (void)drawRect:(NSRect)rect { BOOL isKey = [[self window] isKeyWindow]; + ThemeProvider* themeProvider = [[self window] themeProvider]; - GTMTheme* theme = [self gtm_theme]; - - NSImage* backgroundImage = [theme backgroundImageForStyle:GTMThemeStyleToolBar - state:GTMThemeStateActiveWindow]; + NSImage* backgroundImage = themeProvider->GetNSImageNamed(IDR_THEME_TOOLBAR, + false); if (backgroundImage) { // We want our backgrounds for the shelf to be phased from the upper // left hand corner of the view. @@ -30,8 +34,9 @@ [color set]; NSRectFill([self bounds]); } else { - NSGradient* gradient = [theme gradientForStyle:GTMThemeStyleToolBar - state:isKey]; + NSGradient* gradient = themeProvider->GetNSGradient( + isKey ? BrowserThemeProvider::GRADIENT_TOOLBAR : + BrowserThemeProvider::GRADIENT_TOOLBAR_INACTIVE); // TODO(avi) http://crbug.com/36485; base != window NSPoint startPoint = [self convertPointFromBase:NSMakePoint(0, 0)]; NSPoint endPoint = [self convertPointFromBase: |