diff options
| author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 14:09:20 +0000 |
|---|---|---|
| committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 14:09:20 +0000 |
| commit | 42f60f1d90bdbff386c7f376671b5c271149c2ed (patch) | |
| tree | 468ced882d1d2a866373eaa131a283b3be098b14 | |
| parent | 83acf96f3a4632e4c962ebc3f0f84e3f989322df (diff) | |
| download | chromium_src-42f60f1d90bdbff386c7f376671b5c271149c2ed.zip chromium_src-42f60f1d90bdbff386c7f376671b5c271149c2ed.tar.gz chromium_src-42f60f1d90bdbff386c7f376671b5c271149c2ed.tar.bz2 | |
[Mac] Get theme providers from a window's delegate, not its window controller. These are actually the same object, but they are set at different times during the switch to fullscreen.
BUG=39323
TEST=Go fullscreen with the Android Robot theme installed. Tab text for unselected tabs should be grey, not black.
Review URL: http://codereview.chromium.org/1576019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43708 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/chrome_browser_window.mm | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/fullscreen_window.mm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/cocoa/chrome_browser_window.mm b/chrome/browser/cocoa/chrome_browser_window.mm index a09f884..67a612b 100644 --- a/chrome/browser/cocoa/chrome_browser_window.mm +++ b/chrome/browser/cocoa/chrome_browser_window.mm @@ -344,15 +344,15 @@ namespace { } - (ThemeProvider*)themeProvider { - return [[self windowController] themeProvider]; + return [[self delegate] themeProvider]; } - (ThemedWindowStyle)themedWindowStyle { - return [[self windowController] themedWindowStyle]; + return [[self delegate] themedWindowStyle]; } - (NSPoint)themePatternPhase { - return [[self windowController] themePatternPhase]; + return [[self delegate] themePatternPhase]; } @end diff --git a/chrome/browser/cocoa/fullscreen_window.mm b/chrome/browser/cocoa/fullscreen_window.mm index 9251aa8..4218d11 100644 --- a/chrome/browser/cocoa/fullscreen_window.mm +++ b/chrome/browser/cocoa/fullscreen_window.mm @@ -83,15 +83,15 @@ } - (ThemeProvider*)themeProvider { - return [[self windowController] themeProvider]; + return [[self delegate] themeProvider]; } - (ThemedWindowStyle)themedWindowStyle { - return [[self windowController] themedWindowStyle]; + return [[self delegate] themedWindowStyle]; } - (NSPoint)themePatternPhase { - return [[self windowController] themePatternPhase]; + return [[self delegate] themePatternPhase]; } @end |