summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-18 12:52:46 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-18 12:52:46 +0000
commitb721743f6b9b79de274c55157994c7201cc78782 (patch)
tree8f18d6880e4779cbf65acbcf6e6d63b4cf77dd21
parent912256b3517241047095dac6946de191029dda27 (diff)
downloadchromium_src-b721743f6b9b79de274c55157994c7201cc78782.zip
chromium_src-b721743f6b9b79de274c55157994c7201cc78782.tar.gz
chromium_src-b721743f6b9b79de274c55157994c7201cc78782.tar.bz2
Allow popup windows to have a title displayed in the titlebar.
BUG=17918 TEST=popups get a title, nobody else does. Expose should show title. Review URL: http://codereview.chromium.org/209020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26559 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/browser_window_cocoa.mm6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index 85b355c..12dab28 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -97,6 +97,12 @@ void BrowserWindowCocoa::UpdateTitleBar() {
NSString* newTitle =
base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
+ // Only set the title if we're a popup window. If we call setTitle on a
+ // regular browser window, it will show up in the titlle bar and cover the
+ // tab strip.
+ if (browser_->type() == Browser::TYPE_POPUP)
+ [window_ setTitle:newTitle];
+
// Window menu
[NSApp changeWindowsItem:window_ title:newTitle filename:NO];