diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-27 15:29:20 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-27 15:29:20 +0000 |
| commit | 4475d238aa6c07809c11ce80c34a75321ecc94b2 (patch) | |
| tree | 24d79450b967e388e27a2845cffbb2a2c1e8f847 /content | |
| parent | 59759fcfdc091c9c77db249a6781308c8c3fd942 (diff) | |
| download | chromium_src-4475d238aa6c07809c11ce80c34a75321ecc94b2.zip chromium_src-4475d238aa6c07809c11ce80c34a75321ecc94b2.tar.gz chromium_src-4475d238aa6c07809c11ce80c34a75321ecc94b2.tar.bz2 | |
DevTools: move devtools_ui into content since it should be able to serve devtools files.
BUG=84078
TEST=
Review URL: http://codereview.chromium.org/7453021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/debugger/DEPS | 4 | ||||
| -rw-r--r-- | content/browser/debugger/devtools_http_protocol_handler.cc | 3 | ||||
| -rw-r--r-- | content/browser/debugger/devtools_manager.cc | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/content/browser/debugger/DEPS b/content/browser/debugger/DEPS index db358e1..9199857 100644 --- a/content/browser/debugger/DEPS +++ b/content/browser/debugger/DEPS @@ -7,16 +7,12 @@ include_rules = [ # http://crbug.com/84078 - # devtools_manager.cc, http://codereview.chromium.org/7310029/ - "+chrome/browser/browser_process.h", - # worker_devtools_manager_io.cc "+chrome/browser/debugger/devtools_window.h", "+chrome/browser/profiles/profile_manager.h", # devtools_http_protocol_handler.cc "+ui/base/resource/resource_bundle.h", - "+chrome/browser/ui/webui/devtools_ui.h", # DO NOT ADD ANY MORE TO THIS LIST!!! SEE ABOVE COMMENT ] diff --git a/content/browser/debugger/devtools_http_protocol_handler.cc b/content/browser/debugger/devtools_http_protocol_handler.cc index 9852b65..0801906 100644 --- a/content/browser/debugger/devtools_http_protocol_handler.cc +++ b/content/browser/debugger/devtools_http_protocol_handler.cc @@ -16,7 +16,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/webui/devtools_ui.h" #include "content/browser/browser_thread.h" #include "content/browser/debugger/devtools_client_host.h" #include "content/browser/debugger/devtools_manager.h" @@ -207,8 +206,6 @@ void DevToolsHttpProtocolHandler::OnHttpRequest( return; } - // Make sure DevTools data source is registered. - DevToolsUI::RegisterDevToolsDataSource(); Bind(request, connection_id); request->set_context( Profile::Deprecated::GetDefaultRequestContext()->GetURLRequestContext()); diff --git a/content/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc index c79aee7..01e6479 100644 --- a/content/browser/debugger/devtools_manager.cc +++ b/content/browser/debugger/devtools_manager.cc @@ -7,7 +7,6 @@ #include <vector> #include "base/message_loop.h" -#include "chrome/browser/browser_process.h" #include "content/browser/browser_thread.h" #include "content/browser/browsing_instance.h" #include "content/browser/child_process_security_policy.h" |