diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-03 12:06:06 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-03 12:06:06 +0000 |
| commit | 30c58691961266c918daaf10f2b867b27691dd89 (patch) | |
| tree | fdd7651e9dffc79221c365a284a4d8bc40b7a1d9 /chrome/browser/devtools | |
| parent | 2a59ebeb4f6684eda0cbdf9183cb9fce7b32247c (diff) | |
| download | chromium_src-30c58691961266c918daaf10f2b867b27691dd89.zip chromium_src-30c58691961266c918daaf10f2b867b27691dd89.tar.gz chromium_src-30c58691961266c918daaf10f2b867b27691dd89.tar.bz2 | |
DevTools: open remote front-ends using chrome-devtools://remote/* urls.
BUG=13392008
TBR=brettw (for oneliners outside webui)
This change splits chrome-devtools:// handler into the one serving chrome-devtools://devtools (for embedded) and chrome-devtools://remote (for remote) front-ends. It also remove command line check for remote/ path.
Drive-by: move url constants from content/ to chrome/, remove legacy data source registration.
Review URL: https://codereview.chromium.org/13465007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/devtools')
| -rw-r--r-- | chrome/browser/devtools/devtools_window.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/devtools/remote_debugging_server.cc | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index f5738d6..0d9552c 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -240,7 +240,7 @@ DevToolsWindow* DevToolsWindow::Create( RenderViewHost* render_view_host = web_contents->GetRenderViewHost(); content::DevToolsClientHost::SetupDevToolsFrontendClient(render_view_host); - if (url.path().find(chrome::kChromeUIDevToolsHostedPath) == 0) { + if (url.host() == chrome::kChromeUIDevToolsBundledHost) { // Only allow file scheme in embedded front-end by default. int process_id = render_view_host->GetProcess()->GetID(); content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme( diff --git a/chrome/browser/devtools/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc index d1b9fcd..e89d013 100644 --- a/chrome/browser/devtools/remote_debugging_server.cc +++ b/chrome/browser/devtools/remote_debugging_server.cc @@ -15,9 +15,6 @@ RemoteDebuggingServer::RemoteDebuggingServer( const std::string& ip, int port, const std::string& frontend_url) { - // Initialize DevTools data source. - DevToolsUI::RegisterDevToolsDataSource(profile); - devtools_http_handler_ = content::DevToolsHttpHandler::Start( new net::TCPListenSocketFactory(ip, port), frontend_url, |