diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 08:18:52 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 08:18:52 +0000 |
| commit | 3b553cca52ab5e58ebb7629819150c68ec439aa0 (patch) | |
| tree | f7de83dcf68f138e6d10bba9490a3638c7c76302 /chrome | |
| parent | 31af2abddfa0c05ee19de5b4646197fa552c7e49 (diff) | |
| download | chromium_src-3b553cca52ab5e58ebb7629819150c68ec439aa0.zip chromium_src-3b553cca52ab5e58ebb7629819150c68ec439aa0.tar.gz chromium_src-3b553cca52ab5e58ebb7629819150c68ec439aa0.tar.bz2 | |
BUG=none
When merging in GTMTheme/ThemeProvider changes I missed one. Adding
in a patch to make correct since the "half converted" state makes the
code unhappy.
Error was seen as bookmark bar folder windows with themed text but NOT
with a themed background.
Review URL: http://codereview.chromium.org/660071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/background_gradient_view.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_controller.mm | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_window.mm | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/background_gradient_view.mm b/chrome/browser/cocoa/background_gradient_view.mm index 96e3773..ba7a760 100644 --- a/chrome/browser/cocoa/background_gradient_view.mm +++ b/chrome/browser/cocoa/background_gradient_view.mm @@ -29,7 +29,7 @@ - (void)drawBackground { BOOL isKey = [[self window] isKeyWindow]; - GTMTheme* theme = [self gtm_theme]; + GTMTheme* theme = [[self window] gtm_theme]; NSImage* backgroundImage = [theme backgroundImageForStyle:GTMThemeStyleToolBar state:GTMThemeStateActiveWindow]; diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm index 64488cf..4c50976 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm @@ -224,6 +224,10 @@ return [parentController_ themeProvider]; } +- (GTMTheme*)gtm_theme { + return [[parentController_ parentWindow] gtm_theme]; +} + // Recursively close all bookmark folders. - (void)closeAllBookmarkFolders { // Closing the top level implicitly closes all children. diff --git a/chrome/browser/cocoa/bookmark_bar_folder_window.mm b/chrome/browser/cocoa/bookmark_bar_folder_window.mm index f911777..73ca780 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_window.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_window.mm @@ -4,6 +4,9 @@ #import "chrome/browser/cocoa/bookmark_bar_folder_window.h" +#import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" +#import "chrome/browser/cocoa/GTMTheme.h" + @implementation BookmarkBarFolderWindow - (id)initWithContentRect:(NSRect)contentRect @@ -16,4 +19,8 @@ defer:deferCreation]; } +- (GTMTheme*)gtm_theme { + return [[self windowController] gtm_theme]; +} + @end |