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..1124342a20656ce48a7eb85d25f283b19bf98e60 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,12 @@ 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(), |
dgozman
2014/08/06 08:21:07
Are you sure this will be a new tab? Let's set
par
vkuzkokov
2014/08/06 08:47:45
I looked up in source. Adding anyway.
|
+ url, content::PAGE_TRANSITION_TYPED); |
sky
2014/08/05 17:47:00
Why is this PAGE_TRANSITION_TYPED?
dgozman
2014/08/06 08:21:07
I think this is more like PAGE_TRANSITION_AUTO_TOP
vkuzkokov
2014/08/06 08:47:45
Done.
|
+ Navigate(¶ms); |
dgozman
2014/08/06 08:21:07
nit: chrome::Navigate for better readability.
vkuzkokov
2014/08/06 08:47:45
Done.
|
+ 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>( |