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

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: Introduce progress monitor Created 4 years, 1 month 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 std::string ChromeDevToolsManagerDelegate::GetDiscoveryPageHTML() { 160 std::string ChromeDevToolsManagerDelegate::GetDiscoveryPageHTML() {
160 return ResourceBundle::GetSharedInstance().GetRawDataResource( 161 return ResourceBundle::GetSharedInstance().GetRawDataResource(
161 IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string(); 162 IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
162 } 163 }
163 164
164 std::string ChromeDevToolsManagerDelegate::GetFrontendResource( 165 std::string ChromeDevToolsManagerDelegate::GetFrontendResource(
165 const std::string& path) { 166 const std::string& path) {
166 return content::DevToolsFrontendHost::GetFrontendResource(path).as_string(); 167 return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
167 } 168 }
168 169
170 std::string ChromeDevToolsManagerDelegate::GetBrowserTargetGUID() {
171 CR_DEFINE_STATIC_LOCAL(std::string, guid, (base::GenerateGUID()));
172 return guid;
173 }
174
169 void ChromeDevToolsManagerDelegate::DevToolsAgentHostAttached( 175 void ChromeDevToolsManagerDelegate::DevToolsAgentHostAttached(
170 content::DevToolsAgentHost* agent_host) { 176 content::DevToolsAgentHost* agent_host) {
171 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, true); 177 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, true);
172 } 178 }
173 179
174 void ChromeDevToolsManagerDelegate::DevToolsAgentHostDetached( 180 void ChromeDevToolsManagerDelegate::DevToolsAgentHostDetached(
175 content::DevToolsAgentHost* agent_host) { 181 content::DevToolsAgentHost* agent_host) {
176 if (agent_host == remote_locations_requester_) { 182 if (agent_host == remote_locations_requester_) {
177 remote_locations_requester_ = nullptr; 183 remote_locations_requester_ = nullptr;
178 device_discovery_.reset(); 184 device_discovery_.reset();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 237
232 device_discovery_.reset(new DevToolsDeviceDiscovery(device_manager_.get(), 238 device_discovery_.reset(new DevToolsDeviceDiscovery(device_manager_.get(),
233 base::Bind(&ChromeDevToolsManagerDelegate::DevicesAvailable, 239 base::Bind(&ChromeDevToolsManagerDelegate::DevicesAvailable,
234 base::Unretained(this)))); 240 base::Unretained(this))));
235 } 241 }
236 242
237 std::unique_ptr<base::DictionaryValue> result( 243 std::unique_ptr<base::DictionaryValue> result(
238 base::MakeUnique<base::DictionaryValue>()); 244 base::MakeUnique<base::DictionaryValue>());
239 return DevToolsProtocol::CreateSuccessResponse(command_id, std::move(result)); 245 return DevToolsProtocol::CreateSuccessResponse(command_id, std::move(result));
240 } 246 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698