| Index: chrome/browser/devtools/browser_list_tabcontents_provider.cc
|
| diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
|
| index 5d98f6ccc0ca43e86b76c4ee7b583622f66b31ec..32df3e6db147f2728ea1ef6fd4b8e2f3ae96f154 100644
|
| --- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
|
| +++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
|
| @@ -13,6 +13,7 @@
|
| #include "chrome/browser/ui/browser_commands.h"
|
| #include "chrome/browser/ui/browser_iterator.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| +#include "chrome/browser/ui/browser_navigator.h"
|
| #include "chrome/browser/ui/browser_tabstrip.h"
|
| #include "chrome/browser/ui/host_desktop.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| @@ -101,25 +102,13 @@ std::string BrowserListTabContentsProvider::GetPageThumbnailData(
|
|
|
| scoped_ptr<DevToolsTarget>
|
| BrowserListTabContentsProvider::CreateNewTarget(const GURL& url) {
|
| - const BrowserList* browser_list =
|
| - BrowserList::GetInstance(host_desktop_type_);
|
| - WebContents* web_contents;
|
| - if (browser_list->empty()) {
|
| - chrome::NewEmptyWindow(ProfileManager::GetLastUsedProfile(),
|
| - host_desktop_type_);
|
| - if (browser_list->empty())
|
| - return scoped_ptr<DevToolsTarget>();
|
| - web_contents =
|
| - browser_list->get(0)->tab_strip_model()->GetActiveWebContents();
|
| - web_contents->GetController().LoadURL(url,
|
| - content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());
|
| - } else {
|
| - web_contents = chrome::AddSelectedTabWithURL(
|
| - browser_list->get(0),
|
| - url,
|
| - content::PAGE_TRANSITION_LINK);
|
| - }
|
| - content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
|
| + chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(),
|
| + url, content::PAGE_TRANSITION_AUTO_TOPLEVEL);
|
| + params.disposition = NEW_FOREGROUND_TAB;
|
| + chrome::Navigate(¶ms);
|
| + if (!params.target_contents)
|
| + return scoped_ptr<DevToolsTarget>();
|
| + content::RenderViewHost* rvh = params.target_contents->GetRenderViewHost();
|
| if (!rvh)
|
| return scoped_ptr<DevToolsTarget>();
|
| return scoped_ptr<DevToolsTarget>(
|
|
|