diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 18:36:12 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 18:36:12 +0000 |
| commit | 53ee4e180c8481c8054e5f8997376f1c79544b1f (patch) | |
| tree | 0e87181b12dc6777aa26533cbc6716ce3409cff1 /chrome/browser/cocoa/browser_window_controller.mm | |
| parent | a05c2ef0084fecfdfe297abeb2a6268b73abfce5 (diff) | |
| download | chromium_src-53ee4e180c8481c8054e5f8997376f1c79544b1f.zip chromium_src-53ee4e180c8481c8054e5f8997376f1c79544b1f.tar.gz chromium_src-53ee4e180c8481c8054e5f8997376f1c79544b1f.tar.bz2 | |
Another pass at removal of GTMTheme. Also fixes unreadability of bookmark bar/status bubble in unthemed incognito mode.
BUG=http://crbug.com/35554 ; http://crbug.com/29845
TEST=no visible change in normal mode; themed incognito windows should look ugly still but in a different way
Review URL: http://codereview.chromium.org/650092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_window_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/browser_window_controller.mm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index d2460ac..d31b544 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -14,6 +14,7 @@ #include "chrome/app/chrome_dll_resource.h" // IDC_* #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" +#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/dock_info.h" #include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/location_bar.h" @@ -42,6 +43,7 @@ #import "chrome/browser/cocoa/tab_strip_controller.h" #import "chrome/browser/cocoa/tab_strip_view.h" #import "chrome/browser/cocoa/tab_view.h" +#import "chrome/browser/cocoa/themed_window.h" #import "chrome/browser/cocoa/toolbar_controller.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/sync/profile_sync_service.h" @@ -1307,6 +1309,14 @@ } - (NSPoint)gtm_themePatternPhaseForWindow:(NSWindow*)window { + return [self themePatternPhase]; +} + +- (ThemeProvider*)themeProvider { + return browser_->profile()->GetThemeProvider(); +} + +- (NSPoint)themePatternPhase { // Our patterns want to be drawn from the upper left hand corner of the view. // Cocoa wants to do it from the lower left of the window. // @@ -1318,7 +1328,7 @@ const CGFloat kPatternHorizontalOffset = -5; NSView* tabStripView = [self tabStripView]; NSRect tabStripViewWindowBounds = [tabStripView bounds]; - NSView* windowChromeView = [[window contentView] superview]; + NSView* windowChromeView = [[[self window] contentView] superview]; tabStripViewWindowBounds = [tabStripView convertRect:tabStripViewWindowBounds toView:windowChromeView]; |