Index: chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
index d48f204f791c34606f217a459d1b3d728ee1b427..00d932d55e32a35eeda7975037c2a7606c213383 100644 |
--- a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
+++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
@@ -8,9 +8,14 @@ |
#include "base/logging.h" |
#include "base/mac/mac_util.h" |
+#include "base/sys_string_conversions.h" |
#include "chrome/app/chrome_command_ids.h" // IDC_* |
+#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/tabs/tab_strip_model.h" |
+#include "chrome/browser/themes/theme_service.h" |
+#include "chrome/browser/themes/theme_service_factory.h" |
#include "chrome/browser/ui/browser.h" |
+#import "chrome/browser/ui/cocoa/browser_window_utils.h" |
#import "chrome/browser/ui/cocoa/event_utils.h" |
#import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
#import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" |
@@ -32,6 +37,22 @@ const int kMinimumWindowSize = 1; |
return self; |
} |
+- (ui::ThemeProvider*)themeProvider { |
+ return ThemeServiceFactory::GetForProfile(windowShim_->browser()->profile()); |
+} |
+ |
+- (ThemedWindowStyle)themedWindowStyle { |
+ ThemedWindowStyle style = THEMED_POPUP; |
+ if (windowShim_->browser()->profile()->IsOffTheRecord()) |
+ style |= THEMED_INCOGNITO; |
+ return style; |
+} |
+ |
+- (NSPoint)themePatternPhase { |
+ NSView* windowView = [[[self window] contentView] superview]; |
+ return [BrowserWindowUtils themePatternPhaseFor:windowView withTabStrip:nil]; |
+} |
+ |
- (void)awakeFromNib { |
NSWindow* window = [self window]; |
@@ -91,6 +112,16 @@ const int kMinimumWindowSize = 1; |
[self enableTabContentsViewAutosizing]; |
} |
+- (void)updateTitleBar { |
+ NSString* newTitle = base::SysUTF16ToNSString( |
+ windowShim_->browser()->GetWindowTitleForCurrentTab()); |
+ pendingWindowTitle_.reset( |
+ [BrowserWindowUtils scheduleReplaceOldTitle:pendingWindowTitle_.get() |
+ withNewTitle:newTitle |
+ forWindow:[self window]]); |
+ [titlebar_view_ setTitle:newTitle]; |
+} |
+ |
- (void)addFindBar:(FindBarCocoaController*)findBarCocoaController { |
NSView* contentView = [[self window] contentView]; |
[contentView addSubview:[findBarCocoaController view]]; |