Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: chrome/browser/devtools/chrome_devtools_manager_delegate.cc

Issue 2514933003: DevTools: enable target domain handler on the browser target, make browser target non-discoverable.
Patch Set: rebaselined Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chrome_devtools_manager_delegate.h" 5 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
6 6
7 #include "base/guid.h"
7 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
8 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
9 #include "build/build_config.h" 10 #include "build/build_config.h"
10 #include "chrome/browser/devtools/device/android_device_manager.h" 11 #include "chrome/browser/devtools/device/android_device_manager.h"
11 #include "chrome/browser/devtools/device/tcp_device_provider.h" 12 #include "chrome/browser/devtools/device/tcp_device_provider.h"
12 #include "chrome/browser/devtools/devtools_network_protocol_handler.h" 13 #include "chrome/browser/devtools/devtools_network_protocol_handler.h"
13 #include "chrome/browser/devtools/devtools_protocol_constants.h" 14 #include "chrome/browser/devtools/devtools_protocol_constants.h"
14 #include "chrome/browser/devtools/devtools_window.h" 15 #include "chrome/browser/devtools/devtools_window.h"
15 #include "chrome/browser/extensions/extension_tab_util.h" 16 #include "chrome/browser/extensions/extension_tab_util.h"
16 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
(...skipping 14 matching lines...) Expand all
31 using content::DevToolsAgentHost; 32 using content::DevToolsAgentHost;
32 33
33 char ChromeDevToolsManagerDelegate::kTypeApp[] = "app"; 34 char ChromeDevToolsManagerDelegate::kTypeApp[] = "app";
34 char ChromeDevToolsManagerDelegate::kTypeBackgroundPage[] = "background_page"; 35 char ChromeDevToolsManagerDelegate::kTypeBackgroundPage[] = "background_page";
35 char ChromeDevToolsManagerDelegate::kTypeWebView[] = "webview"; 36 char ChromeDevToolsManagerDelegate::kTypeWebView[] = "webview";
36 37
37 char kLocationsParam[] = "locations"; 38 char kLocationsParam[] = "locations";
38 char kHostParam[] = "host"; 39 char kHostParam[] = "host";
39 char kPortParam[] = "port"; 40 char kPortParam[] = "port";
40 41
42 // static
43 std::string ChromeDevToolsManagerDelegate::GetBrowserGUID() {
44 CR_DEFINE_STATIC_LOCAL(std::string, guid, (base::GenerateGUID()));
45 return guid;
46 }
47
41 class ChromeDevToolsManagerDelegate::HostData { 48 class ChromeDevToolsManagerDelegate::HostData {
42 public: 49 public:
43 HostData() {} 50 HostData() {}
44 ~HostData() {} 51 ~HostData() {}
45 52
46 RemoteLocations& remote_locations() { return remote_locations_; } 53 RemoteLocations& remote_locations() { return remote_locations_; }
47 54
48 void set_remote_locations(RemoteLocations& locations) { 55 void set_remote_locations(RemoteLocations& locations) {
49 remote_locations_.swap(locations); 56 remote_locations_.swap(locations);
50 } 57 }
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 std::string ChromeDevToolsManagerDelegate::GetDiscoveryPageHTML() { 167 std::string ChromeDevToolsManagerDelegate::GetDiscoveryPageHTML() {
161 return ResourceBundle::GetSharedInstance().GetRawDataResource( 168 return ResourceBundle::GetSharedInstance().GetRawDataResource(
162 IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string(); 169 IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
163 } 170 }
164 171
165 std::string ChromeDevToolsManagerDelegate::GetFrontendResource( 172 std::string ChromeDevToolsManagerDelegate::GetFrontendResource(
166 const std::string& path) { 173 const std::string& path) {
167 return content::DevToolsFrontendHost::GetFrontendResource(path).as_string(); 174 return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
168 } 175 }
169 176
177 std::string ChromeDevToolsManagerDelegate::GetBrowserTargetGUID() {
178 return GetBrowserGUID();
179 }
180
170 void ChromeDevToolsManagerDelegate::DevToolsAgentHostAttached( 181 void ChromeDevToolsManagerDelegate::DevToolsAgentHostAttached(
171 content::DevToolsAgentHost* agent_host) { 182 content::DevToolsAgentHost* agent_host) {
172 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, true); 183 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, true);
173 184
174 DCHECK(host_data_.find(agent_host) == host_data_.end()); 185 DCHECK(host_data_.find(agent_host) == host_data_.end());
175 host_data_[agent_host].reset(new ChromeDevToolsManagerDelegate::HostData()); 186 host_data_[agent_host].reset(new ChromeDevToolsManagerDelegate::HostData());
176 } 187 }
177 188
178 void ChromeDevToolsManagerDelegate::DevToolsAgentHostDetached( 189 void ChromeDevToolsManagerDelegate::DevToolsAgentHostDetached(
179 content::DevToolsAgentHost* agent_host) { 190 content::DevToolsAgentHost* agent_host) {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 tcp_locations.insert(net::HostPortPair(host, port)); 284 tcp_locations.insert(net::HostPortPair(host, port));
274 } 285 }
275 286
276 host_data_[agent_host]->set_remote_locations(tcp_locations); 287 host_data_[agent_host]->set_remote_locations(tcp_locations);
277 UpdateDeviceDiscovery(); 288 UpdateDeviceDiscovery();
278 289
279 std::unique_ptr<base::DictionaryValue> result( 290 std::unique_ptr<base::DictionaryValue> result(
280 base::MakeUnique<base::DictionaryValue>()); 291 base::MakeUnique<base::DictionaryValue>());
281 return DevToolsProtocol::CreateSuccessResponse(command_id, std::move(result)); 292 return DevToolsProtocol::CreateSuccessResponse(command_id, std::move(result));
282 } 293 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698