| 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 } | 101 } |
| 102 | 102 |
| 103 scoped_ptr<DevToolsTarget> | 103 scoped_ptr<DevToolsTarget> |
| 104 BrowserListTabContentsProvider::CreateNewTarget(const GURL& url) { | 104 BrowserListTabContentsProvider::CreateNewTarget(const GURL& url) { |
| 105 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), | 105 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), |
| 106 url, content::PAGE_TRANSITION_AUTO_TOPLEVEL); | 106 url, content::PAGE_TRANSITION_AUTO_TOPLEVEL); |
| 107 params.disposition = NEW_FOREGROUND_TAB; | 107 params.disposition = NEW_FOREGROUND_TAB; |
| 108 chrome::Navigate(¶ms); | 108 chrome::Navigate(¶ms); |
| 109 if (!params.target_contents) | 109 if (!params.target_contents) |
| 110 return scoped_ptr<DevToolsTarget>(); | 110 return scoped_ptr<DevToolsTarget>(); |
| 111 content::RenderViewHost* rvh = params.target_contents->GetRenderViewHost(); | |
| 112 if (!rvh) | |
| 113 return scoped_ptr<DevToolsTarget>(); | |
| 114 return scoped_ptr<DevToolsTarget>( | 111 return scoped_ptr<DevToolsTarget>( |
| 115 DevToolsTargetImpl::CreateForRenderViewHost(rvh, true)); | 112 DevToolsTargetImpl::CreateForWebContents(params.target_contents, true)); |
| 116 } | 113 } |
| 117 | 114 |
| 118 void BrowserListTabContentsProvider::EnumerateTargets(TargetCallback callback) { | 115 void BrowserListTabContentsProvider::EnumerateTargets(TargetCallback callback) { |
| 119 DevToolsTargetImpl::EnumerateAllTargets( | 116 DevToolsTargetImpl::EnumerateAllTargets( |
| 120 *reinterpret_cast<DevToolsTargetImpl::Callback*>(&callback)); | 117 *reinterpret_cast<DevToolsTargetImpl::Callback*>(&callback)); |
| 121 } | 118 } |
| 122 | 119 |
| 123 scoped_ptr<net::StreamListenSocket> | 120 scoped_ptr<net::StreamListenSocket> |
| 124 BrowserListTabContentsProvider::CreateSocketForTethering( | 121 BrowserListTabContentsProvider::CreateSocketForTethering( |
| 125 net::StreamListenSocket::Delegate* delegate, | 122 net::StreamListenSocket::Delegate* delegate, |
| 126 std::string* name) { | 123 std::string* name) { |
| 127 if (!g_tethering_enabled.Get()) | 124 if (!g_tethering_enabled.Get()) |
| 128 return scoped_ptr<net::StreamListenSocket>(); | 125 return scoped_ptr<net::StreamListenSocket>(); |
| 129 | 126 |
| 130 if (last_tethering_port_ == kMaxTetheringPort) | 127 if (last_tethering_port_ == kMaxTetheringPort) |
| 131 last_tethering_port_ = kMinTetheringPort; | 128 last_tethering_port_ = kMinTetheringPort; |
| 132 int port = ++last_tethering_port_; | 129 int port = ++last_tethering_port_; |
| 133 *name = base::IntToString(port); | 130 *name = base::IntToString(port); |
| 134 return net::TCPListenSocket::CreateAndListen("127.0.0.1", port, delegate) | 131 return net::TCPListenSocket::CreateAndListen("127.0.0.1", port, delegate) |
| 135 .PassAs<net::StreamListenSocket>(); | 132 .PassAs<net::StreamListenSocket>(); |
| 136 } | 133 } |
| OLD | NEW |