diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-26 15:30:28 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-26 15:30:28 +0000 |
| commit | 3d1104f27426048f4a951a614507b047fc7fd416 (patch) | |
| tree | 559ee421338ba8fd85ea072bcde1003602086f30 /chrome/browser/browser.cc | |
| parent | 10f2e7c37e44d513524f816a230d47b503362460 (diff) | |
| download | chromium_src-3d1104f27426048f4a951a614507b047fc7fd416.zip chromium_src-3d1104f27426048f4a951a614507b047fc7fd416.tar.gz chromium_src-3d1104f27426048f4a951a614507b047fc7fd416.tar.bz2 | |
Allow live tabs to be dragged out of a window. Change TabStripModel such that
the caller must now explicitly show the newly created browser rather than it
happening automatically.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index f1b3a5b..59b8157 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1307,9 +1307,9 @@ GURL Browser::GetBlankTabURL() const { return GURL(chrome::kChromeUINewTabURL); } -void Browser::CreateNewStripWithContents(TabContents* detached_contents, - const gfx::Rect& window_bounds, - const DockInfo& dock_info) { +Browser* Browser::CreateNewStripWithContents(TabContents* detached_contents, + const gfx::Rect& window_bounds, + const DockInfo& dock_info) { DCHECK(type_ == TYPE_NORMAL); gfx::Rect new_window_bounds = window_bounds; @@ -1327,7 +1327,7 @@ void Browser::CreateNewStripWithContents(TabContents* detached_contents, // Make sure the loading state is updated correctly, otherwise the throbber // won't start if the page is loading. browser->LoadingStateChanged(detached_contents); - browser->window()->Show(); + return browser; } int Browser::GetDragActions() const { |