From 513209b27ff55e2841eac0e4120199c23acce758 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 18 Nov 2010 18:32:45 +0000 Subject: Merge Chromium at r65505: Initial merge by git. Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45 --- chrome/browser/cocoa/browser_window_controller.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'chrome/browser/cocoa/browser_window_controller.mm') 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]; -- cgit v1.1