OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/devtools/browser_list_tabcontents_provider.h" | 5 #include "chrome/browser/devtools/browser_list_tabcontents_provider.h" |
6 | 6 |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
9 #include "chrome/browser/devtools/devtools_target_impl.h" | 9 #include "chrome/browser/devtools/devtools_target_impl.h" |
10 #include "chrome/browser/history/top_sites.h" | 10 #include "chrome/browser/history/top_sites.h" |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 | 98 |
99 return std::string(); | 99 return std::string(); |
100 } | 100 } |
101 | 101 |
102 scoped_ptr<DevToolsTarget> | 102 scoped_ptr<DevToolsTarget> |
103 BrowserListTabContentsProvider::CreateNewTarget(const GURL& url) { | 103 BrowserListTabContentsProvider::CreateNewTarget(const GURL& url) { |
104 const BrowserList* browser_list = | 104 const BrowserList* browser_list = |
105 BrowserList::GetInstance(host_desktop_type_); | 105 BrowserList::GetInstance(host_desktop_type_); |
106 WebContents* web_contents; | 106 WebContents* web_contents; |
107 if (browser_list->empty()) { | 107 if (browser_list->empty()) { |
108 chrome::NewEmptyWindow(ProfileManager::GetLastUsedProfile(), | 108 chrome::NewWindow(ProfileManager::GetLastUsedProfile(), |
109 host_desktop_type_); | 109 host_desktop_type_, url); |
110 if (browser_list->empty()) | 110 if (browser_list->empty()) |
111 return scoped_ptr<DevToolsTarget>(); | 111 return scoped_ptr<DevToolsTarget>(); |
112 web_contents = | 112 web_contents = |
113 browser_list->get(0)->tab_strip_model()->GetActiveWebContents(); | 113 browser_list->get(0)->tab_strip_model()->GetActiveWebContents(); |
114 web_contents->GetController().LoadURL(url, | |
115 content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); | |
116 } else { | 114 } else { |
117 web_contents = chrome::AddSelectedTabWithURL( | 115 web_contents = chrome::AddSelectedTabWithURL( |
118 browser_list->get(0), | 116 browser_list->get(0), |
119 url, | 117 url, |
120 content::PAGE_TRANSITION_LINK); | 118 content::PAGE_TRANSITION_LINK); |
121 } | 119 } |
122 content::RenderViewHost* rvh = web_contents->GetRenderViewHost(); | 120 content::RenderViewHost* rvh = web_contents->GetRenderViewHost(); |
123 if (!rvh) | 121 if (!rvh) |
124 return scoped_ptr<DevToolsTarget>(); | 122 return scoped_ptr<DevToolsTarget>(); |
125 return scoped_ptr<DevToolsTarget>( | 123 return scoped_ptr<DevToolsTarget>( |
(...skipping 12 matching lines...) Expand all Loading... |
138 if (!g_tethering_enabled.Get()) | 136 if (!g_tethering_enabled.Get()) |
139 return scoped_ptr<net::StreamListenSocket>(); | 137 return scoped_ptr<net::StreamListenSocket>(); |
140 | 138 |
141 if (last_tethering_port_ == kMaxTetheringPort) | 139 if (last_tethering_port_ == kMaxTetheringPort) |
142 last_tethering_port_ = kMinTetheringPort; | 140 last_tethering_port_ = kMinTetheringPort; |
143 int port = ++last_tethering_port_; | 141 int port = ++last_tethering_port_; |
144 *name = base::IntToString(port); | 142 *name = base::IntToString(port); |
145 return net::TCPListenSocket::CreateAndListen("127.0.0.1", port, delegate) | 143 return net::TCPListenSocket::CreateAndListen("127.0.0.1", port, delegate) |
146 .PassAs<net::StreamListenSocket>(); | 144 .PassAs<net::StreamListenSocket>(); |
147 } | 145 } |
OLD | NEW |