diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 18:25:24 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 18:25:24 +0000 |
| commit | c809ca2110911e202720a79bfa082a47f2657849 (patch) | |
| tree | b8ada81b3bd80704c5705e0612e1813a07732cee | |
| parent | 8358e0d98e1cb301992abd1ad482cdd6c681f54c (diff) | |
| download | chromium_src-c809ca2110911e202720a79bfa082a47f2657849.zip chromium_src-c809ca2110911e202720a79bfa082a47f2657849.tar.gz chromium_src-c809ca2110911e202720a79bfa082a47f2657849.tar.bz2 | |
Merge 202028 "http 'new' opens 2 tabs when there are no windows ..."
> http 'new' opens 2 tabs when there are no windows on cros.
>
> BUG=241925
> TEST=manual
>
> Review URL: https://chromiumcodereview.appspot.com/15356002
TBR=achuith@chromium.org
Review URL: https://codereview.chromium.org/16337013
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@203739 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/devtools/browser_list_tabcontents_provider.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc index 2db6e96..68f5b44 100644 --- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc +++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc @@ -19,6 +19,7 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" @@ -91,11 +92,12 @@ RenderViewHost* BrowserListTabContentsProvider::CreateNewTarget() { const BrowserList* browser_list = BrowserList::GetInstance(host_desktop_type_); - if (browser_list->empty()) + if (browser_list->empty()) { chrome::NewEmptyWindow(profile_, host_desktop_type_); - - if (browser_list->empty()) - return NULL; + return browser_list->empty() ? NULL : + browser_list->get(0)->tab_strip_model()->GetActiveWebContents()-> + GetRenderViewHost(); + } content::WebContents* web_contents = chrome::AddSelectedTabWithURL( browser_list->get(0), |