diff options
| -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 |