summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/browser_window_controller.mm
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-11-18 18:32:45 +0000
committerBen Murdoch <benm@google.com>2010-11-18 18:38:07 +0000
commit513209b27ff55e2841eac0e4120199c23acce758 (patch)
treeaeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/cocoa/browser_window_controller.mm
parent164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff)
downloadexternal_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/cocoa/browser_window_controller.mm')
-rw-r--r--chrome/browser/cocoa/browser_window_controller.mm5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index dc9f400..0e39267 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -13,7 +13,7 @@
#include "base/nsimage_cache_mac.h"
#import "base/scoped_nsobject.h"
#include "base/sys_string_conversions.h"
-#include "chrome/app/chrome_dll_resource.h" // IDC_*
+#include "chrome/app/chrome_command_ids.h" // IDC_*
#include "chrome/browser/bookmarks/bookmark_editor.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
@@ -1887,6 +1887,9 @@ willAnimateFromState:(bookmarks::VisualState)oldState
if (statusBubble_)
statusBubble_->SwitchParentWindow(destWindow);
+ // Move the title over.
+ [destWindow setTitle:[window title]];
+
// The window needs to be onscreen before we can set its first responder.
[destWindow makeKeyAndOrderFront:self];
[focusTracker restoreFocusInWindow:destWindow];