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

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

Issue 2300703005: DevTools: merge devtools_http_handler into content - it is used in all the embedders anyways. (Closed)
Patch Set: for_landing! Created 4 years, 3 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/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/browser/devtools/devtools_network_protocol_handler.h" 9 #include "chrome/browser/devtools/devtools_network_protocol_handler.h"
10 #include "chrome/browser/devtools/devtools_window.h" 10 #include "chrome/browser/devtools/devtools_window.h"
11 #include "chrome/browser/extensions/extension_tab_util.h" 11 #include "chrome/browser/extensions/extension_tab_util.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/ui/browser_navigator.h" 14 #include "chrome/browser/ui/browser_navigator.h"
15 #include "chrome/browser/ui/browser_navigator_params.h" 15 #include "chrome/browser/ui/browser_navigator_params.h"
16 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" 16 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
17 #include "chrome/grit/browser_resources.h"
17 #include "components/guest_view/browser/guest_view_base.h" 18 #include "components/guest_view/browser/guest_view_base.h"
18 #include "content/public/browser/devtools_agent_host.h" 19 #include "content/public/browser/devtools_agent_host.h"
19 #include "content/public/browser/render_frame_host.h" 20 #include "content/public/browser/render_frame_host.h"
20 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
21 #include "extensions/browser/extension_host.h" 22 #include "extensions/browser/extension_host.h"
22 #include "extensions/browser/extension_registry.h" 23 #include "extensions/browser/extension_registry.h"
23 #include "extensions/browser/process_manager.h" 24 #include "extensions/browser/process_manager.h"
25 #include "ui/base/resource/resource_bundle.h"
24 26
25 char ChromeDevToolsManagerDelegate::kTypeApp[] = "app"; 27 char ChromeDevToolsManagerDelegate::kTypeApp[] = "app";
26 char ChromeDevToolsManagerDelegate::kTypeBackgroundPage[] = "background_page"; 28 char ChromeDevToolsManagerDelegate::kTypeBackgroundPage[] = "background_page";
27 char ChromeDevToolsManagerDelegate::kTypeWebView[] = "webview"; 29 char ChromeDevToolsManagerDelegate::kTypeWebView[] = "webview";
28 30
29 ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate() 31 ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate()
30 : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) { 32 : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) {
31 content::DevToolsAgentHost::AddDiscoveryProvider( 33 content::DevToolsAgentHost::AddDiscoveryProvider(
32 base::Bind(&content::DevToolsAgentHost::GetOrCreateAll)); 34 base::Bind(&content::DevToolsAgentHost::GetOrCreateAll));
33 } 35 }
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) { 127 ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
126 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), 128 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(),
127 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); 129 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
128 params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB; 130 params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
129 chrome::Navigate(&params); 131 chrome::Navigate(&params);
130 if (!params.target_contents) 132 if (!params.target_contents)
131 return nullptr; 133 return nullptr;
132 return content::DevToolsAgentHost::GetOrCreateFor(params.target_contents); 134 return content::DevToolsAgentHost::GetOrCreateFor(params.target_contents);
133 } 135 }
134 136
137 std::string ChromeDevToolsManagerDelegate::GetDiscoveryPageHTML() {
138 return ResourceBundle::GetSharedInstance().GetRawDataResource(
139 IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
140 }
141
142 std::string ChromeDevToolsManagerDelegate::GetFrontendResource(
143 const std::string& path) {
144 return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
145 }
146
135 void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged( 147 void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged(
136 content::DevToolsAgentHost* agent_host, 148 content::DevToolsAgentHost* agent_host,
137 bool attached) { 149 bool attached) {
138 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached); 150 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached);
139 } 151 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/chrome_devtools_manager_delegate.h ('k') | chrome/browser/devtools/device/devtools_android_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698