diff options
18 files changed, 40 insertions, 33 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index da2608c..24059d48 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -351,7 +351,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kProfilingAtStart, switches::kProfilingFile, switches::kProfilingFlush, - switches::kRemoteShellPort, switches::kSilentDumpOnDCHECK, }; diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 765aa6a..4a98d54 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -105,12 +105,6 @@ 'renderer/chrome_render_view_observer.h', 'renderer/content_settings_observer.cc', 'renderer/content_settings_observer.h', - 'renderer/devtools_agent.cc', - 'renderer/devtools_agent.h', - 'renderer/devtools_agent_filter.cc', - 'renderer/devtools_agent_filter.h', - 'renderer/devtools_client.cc', - 'renderer/devtools_client.h', 'renderer/external_host_bindings.cc', 'renderer/external_host_bindings.h', 'renderer/external_extension.cc', diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 41bc291..e86db41 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -877,9 +877,6 @@ const char kReloadKilledTabs[] = "reload-killed-tabs"; // Enable remote debug over HTTP on the specified port. const char kRemoteDebuggingPort[] = "remote-debugging-port"; -// Enable remote debug / automation shell on the specified port. -const char kRemoteShellPort[] = "remote-shell-port"; - // Indicates the last session should be restored on startup. This overrides // the preferences value and is primarily intended for testing. The value of // this switch is the number of tabs to wait until loaded before diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 8a71040..3ef16d6 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -240,7 +240,6 @@ extern const char kProxyServer[]; extern const char kPurgeMemoryButton[]; extern const char kReloadKilledTabs[]; extern const char kRemoteDebuggingPort[]; -extern const char kRemoteShellPort[]; extern const char kRestoreLastSession[]; extern const char kRestrictInstantToSearch[]; extern const char kSbInfoURLPrefix[]; diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 597b8e4..770f6ae 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -33,8 +33,6 @@ #include "chrome/renderer/chrome_render_process_observer.h" #include "chrome/renderer/chrome_render_view_observer.h" #include "chrome/renderer/content_settings_observer.h" -#include "chrome/renderer/devtools_agent.h" -#include "chrome/renderer/devtools_agent_filter.h" #include "chrome/renderer/extensions/bindings_utils.h" #include "chrome/renderer/extensions/event_bindings.h" #include "chrome/renderer/extensions/extension_dispatcher.h" @@ -165,7 +163,6 @@ void ChromeContentRendererClient::RenderThreadStarted() { #endif RenderThread* thread = RenderThread::current(); - thread->AddFilter(new DevToolsAgentFilter()); thread->AddObserver(chrome_observer_.get()); thread->AddObserver(extension_dispatcher_.get()); @@ -214,7 +211,6 @@ void ChromeContentRendererClient::RenderThreadStarted() { void ChromeContentRendererClient::RenderViewCreated(RenderView* render_view) { ContentSettingsObserver* content_settings = new ContentSettingsObserver(render_view); - new DevToolsAgent(render_view); new ExtensionHelper(render_view, extension_dispatcher_.get()); new PageLoadHistograms(render_view, histogram_snapshots_.get()); new PrintWebViewHelper(render_view); diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc index 7c71dc2..d93f0f2 100644 --- a/content/browser/renderer_host/browser_render_process_host.cc +++ b/content/browser/renderer_host/browser_render_process_host.cc @@ -576,6 +576,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( switches::kPpapiOutOfProcess, switches::kRecordMode, switches::kRegisterPepperPlugins, + switches::kRemoteShellPort, switches::kRendererAssertTest, #if !defined(OFFICIAL_BUILD) switches::kRendererCheckFalseTest, diff --git a/content/common/content_switches.cc b/content/common/content_switches.cc index 9d98571..20dca2a 100644 --- a/content/common/content_switches.cc +++ b/content/common/content_switches.cc @@ -371,6 +371,9 @@ const char kProfileImportProcess[] = "profile-import"; // Register Pepper plugins (see pepper_plugin_registry.cc for its format). const char kRegisterPepperPlugins[] = "register-pepper-plugins"; +// Enable remote debug / automation shell on the specified port. +const char kRemoteShellPort[] = "remote-shell-port"; + // Causes the renderer process to throw an assertion on launch. const char kRendererAssertTest[] = "renderer-assert-test"; diff --git a/content/common/content_switches.h b/content/common/content_switches.h index 0e24440..a61a35b 100644 --- a/content/common/content_switches.h +++ b/content/common/content_switches.h @@ -120,6 +120,7 @@ extern const char kProcessType[]; extern const char kProfileImportProcess[]; extern const char kRecordMode[]; extern const char kRegisterPepperPlugins[]; +extern const char kRemoteShellPort[]; extern const char kRendererAssertTest[]; extern const char kRendererCmdPrefix[]; extern const char kRendererCrashTest[]; diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 6c3c2bf..64c2f8a 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -36,6 +36,12 @@ 'renderer/content_renderer_client.h', 'renderer/device_orientation_dispatcher.cc', 'renderer/device_orientation_dispatcher.h', + 'renderer/devtools_agent.cc', + 'renderer/devtools_agent.h', + 'renderer/devtools_agent_filter.cc', + 'renderer/devtools_agent_filter.h', + 'renderer/devtools_client.cc', + 'renderer/devtools_client.h', 'renderer/external_popup_menu.cc', 'renderer/external_popup_menu.h', 'renderer/geolocation_dispatcher.cc', diff --git a/chrome/renderer/devtools_agent.cc b/content/renderer/devtools_agent.cc index 7593ab4..b154813 100644 --- a/chrome/renderer/devtools_agent.cc +++ b/content/renderer/devtools_agent.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/devtools_agent.h" +#include "content/renderer/devtools_agent.h" #include <map> @@ -10,9 +10,9 @@ #include "base/message_loop.h" #include "base/process.h" #include "base/string_number_conversions.h" -#include "chrome/common/chrome_switches.h" -#include "chrome/renderer/devtools_agent_filter.h" -#include "chrome/renderer/devtools_client.h" +#include "content/common/content_switches.h" +#include "content/renderer/devtools_agent_filter.h" +#include "content/renderer/devtools_client.h" #include "content/common/devtools_messages.h" #include "content/common/view_messages.h" #include "content/renderer/render_view.h" diff --git a/chrome/renderer/devtools_agent.h b/content/renderer/devtools_agent.h index 9f21fa3..a1693b5 100644 --- a/chrome/renderer/devtools_agent.h +++ b/content/renderer/devtools_agent.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_DEVTOOLS_AGENT_H_ -#define CHROME_RENDERER_DEVTOOLS_AGENT_H_ +#ifndef CONTENT_RENDERER_DEVTOOLS_AGENT_H_ +#define CONTENT_RENDERER_DEVTOOLS_AGENT_H_ #pragma once #include <map> @@ -73,4 +73,4 @@ class DevToolsAgent : public RenderViewObserver, DISALLOW_COPY_AND_ASSIGN(DevToolsAgent); }; -#endif // CHROME_RENDERER_DEVTOOLS_AGENT_H_ +#endif // CONTENT_RENDERER_DEVTOOLS_AGENT_H_ diff --git a/chrome/renderer/devtools_agent_filter.cc b/content/renderer/devtools_agent_filter.cc index 330fca3..4890a36 100644 --- a/chrome/renderer/devtools_agent_filter.cc +++ b/content/renderer/devtools_agent_filter.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/devtools_agent_filter.h" +#include "content/renderer/devtools_agent_filter.h" #include "base/message_loop.h" -#include "chrome/common/render_messages.h" -#include "chrome/renderer/devtools_agent.h" #include "content/common/devtools_messages.h" +#include "content/renderer/devtools_agent.h" #include "content/renderer/plugin_channel_host.h" #include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" diff --git a/chrome/renderer/devtools_agent_filter.h b/content/renderer/devtools_agent_filter.h index efe6280..0583885 100644 --- a/chrome/renderer/devtools_agent_filter.h +++ b/content/renderer/devtools_agent_filter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_DEVTOOLS_AGENT_FILTER_H_ -#define CHROME_RENDERER_DEVTOOLS_AGENT_FILTER_H_ +#ifndef CONTENT_RENDERER_DEVTOOLS_AGENT_FILTER_H_ +#define CONTENT_RENDERER_DEVTOOLS_AGENT_FILTER_H_ #pragma once #include <string> @@ -51,4 +51,4 @@ class DevToolsAgentFilter : public IPC::ChannelProxy::MessageFilter { DISALLOW_COPY_AND_ASSIGN(DevToolsAgentFilter); }; -#endif // CHROME_RENDERER_DEVTOOLS_AGENT_FILTER_H_ +#endif // CONTENT_RENDERER_DEVTOOLS_AGENT_FILTER_H_ diff --git a/chrome/renderer/devtools_client.cc b/content/renderer/devtools_client.cc index d4b4c53..cdebbba 100644 --- a/chrome/renderer/devtools_client.cc +++ b/content/renderer/devtools_client.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/renderer/devtools_client.h" +#include "content/renderer/devtools_client.h" #include "base/command_line.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "chrome/common/chrome_switches.h" +#include "content/common/content_switches.h" #include "content/common/devtools_messages.h" #include "content/renderer/render_thread.h" #include "content/renderer/render_view.h" diff --git a/chrome/renderer/devtools_client.h b/content/renderer/devtools_client.h index c4687fc..d00d33f 100644 --- a/chrome/renderer/devtools_client.h +++ b/content/renderer/devtools_client.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_DEVTOOLS_CLIENT_H_ -#define CHROME_RENDERER_DEVTOOLS_CLIENT_H_ +#ifndef CONTENT_RENDERER_DEVTOOLS_CLIENT_H_ +#define CONTENT_RENDERER_DEVTOOLS_CLIENT_H_ #pragma once #include <string> @@ -62,4 +62,4 @@ class DevToolsClient : public RenderViewObserver, DISALLOW_COPY_AND_ASSIGN(DevToolsClient); }; -#endif // CHROME_RENDERER_DEVTOOLS_CLIENT_H_ +#endif // CONTENT_RENDERER_DEVTOOLS_CLIENT_H_ diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc index 81caa2d..ba95709 100644 --- a/content/renderer/render_thread.cc +++ b/content/renderer/render_thread.cc @@ -34,6 +34,7 @@ #include "content/common/web_database_observer_impl.h" #include "content/plugin/npobject_util.h" #include "content/renderer/content_renderer_client.h" +#include "content/renderer/devtools_agent_filter.h" #include "content/renderer/gpu/gpu_channel_host.h" #include "content/renderer/indexed_db_dispatcher.h" #include "content/renderer/media/audio_input_message_filter.h" @@ -183,6 +184,9 @@ void RenderThread::Init() { audio_message_filter_ = new AudioMessageFilter(); AddFilter(audio_message_filter_.get()); + devtools_agent_message_filter_ = new DevToolsAgentFilter(); + AddFilter(devtools_agent_message_filter_.get()); + content::GetContentClient()->renderer()->RenderThreadStarted(); TRACE_EVENT_END_ETW("RenderThread::Init", 0, ""); @@ -197,6 +201,9 @@ RenderThread::~RenderThread() { web_database_observer_impl_->WaitForAllDatabasesToClose(); // Shutdown in reverse of the initialization order. + RemoveFilter(devtools_agent_message_filter_.get()); + devtools_agent_message_filter_ = NULL; + RemoveFilter(audio_input_message_filter_.get()); audio_input_message_filter_ = NULL; diff --git a/content/renderer/render_thread.h b/content/renderer/render_thread.h index 97419bd..d8042c9 100644 --- a/content/renderer/render_thread.h +++ b/content/renderer/render_thread.h @@ -25,6 +25,7 @@ class AppCacheDispatcher; class AudioInputMessageFilter; class AudioMessageFilter; class DBMessageFilter; +class DevToolsAgentFilter; class FilePath; class GpuChannelHost; class IndexedDBDispatcher; @@ -264,6 +265,7 @@ class RenderThread : public RenderThreadBase, scoped_refptr<DBMessageFilter> db_message_filter_; scoped_refptr<AudioInputMessageFilter> audio_input_message_filter_; scoped_refptr<AudioMessageFilter> audio_message_filter_; + scoped_refptr<DevToolsAgentFilter> devtools_agent_message_filter_; // Used on multiple threads. scoped_refptr<VideoCaptureImplManager> vc_manager_; diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 762a637..1eeeb77 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -40,6 +40,7 @@ #include "content/common/url_constants.h" #include "content/common/view_messages.h" #include "content/renderer/content_renderer_client.h" +#include "content/renderer/devtools_agent.h" #include "content/renderer/device_orientation_dispatcher.h" #include "content/renderer/mhtml_generator.h" #include "content/renderer/external_popup_menu.h" @@ -409,6 +410,8 @@ RenderView::RenderView(RenderThreadBase* render_thread, new MHTMLGenerator(this); + new DevToolsAgent(this); + if (command_line.HasSwitch(switches::kEnableMediaStream)) { media_stream_impl_ = new MediaStreamImpl( RenderThread::current()->video_capture_impl_manager()); |