diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 15:05:55 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 15:05:55 +0000 |
| commit | c38aeeeb04c53a4d1c53673ec5575562d3bfe313 (patch) | |
| tree | 08d3e110d3f0176e0eb3a8f59d0ddf22b1b472c5 /chrome/renderer | |
| parent | 4b16cc08cff942a5bccf9ac93626816b3142269c (diff) | |
| download | chromium_src-c38aeeeb04c53a4d1c53673ec5575562d3bfe313.zip chromium_src-c38aeeeb04c53a4d1c53673ec5575562d3bfe313.tar.gz chromium_src-c38aeeeb04c53a4d1c53673ec5575562d3bfe313.tar.bz2 | |
Reverting 13419.
Review URL: http://codereview.chromium.org/65008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/devtools_agent.cc | 1 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 20 |
2 files changed, 7 insertions, 14 deletions
diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc index 046b755..633203c 100644 --- a/chrome/renderer/devtools_agent.cc +++ b/chrome/renderer/devtools_agent.cc @@ -61,7 +61,6 @@ void DevToolsAgent::OnRpcMessage(const std::string& raw_msg) { void DevToolsAgent::OnInspectElement(int x, int y) { WebDevToolsAgent* web_agent = GetWebAgent(); if (web_agent) { - web_agent->Attach(); web_agent->InspectElement(x, y); } } diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 9cef455..b4fc6d5 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -299,19 +299,13 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, decrement_shared_popup_at_destruction_ = false; } - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); - - bool dev_tools_enabled = command_line.HasSwitch( - switches::kEnableOutOfProcessDevTools); - if (dev_tools_enabled) - devtools_agent_.reset(new DevToolsAgent(routing_id, this)); + devtools_agent_.reset(new DevToolsAgent(routing_id, this)); webwidget_ = WebView::Create(this, webkit_prefs); - if (dev_tools_enabled) - devtools_agent_filter_ = new DevToolsAgentFilter( - webview()->GetWebDevToolsAgent(), - routing_id); + devtools_agent_filter_ = new DevToolsAgentFilter( + webview()->GetWebDevToolsAgent(), + routing_id); #if defined(OS_LINUX) // We have to enable ourselves as the editor delegate on linux so we can copy @@ -340,6 +334,7 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, host_window_ = parent_hwnd; modal_dialog_event_.reset(modal_dialog_event); + const CommandLine& command_line = *CommandLine::ForCurrentProcess(); if (command_line.HasSwitch(switches::kDomAutomationController)) enabled_bindings_ |= BindingsPolicy::DOM_AUTOMATION; disable_popup_blocking_ = @@ -347,8 +342,7 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, debug_message_handler_ = new DebugMessageHandler(this); render_thread_->AddFilter(debug_message_handler_); - if (dev_tools_enabled) - render_thread_->AddFilter(devtools_agent_filter_); + render_thread_->AddFilter(devtools_agent_filter_); } void RenderView::OnMessageReceived(const IPC::Message& message) { @@ -359,7 +353,7 @@ void RenderView::OnMessageReceived(const IPC::Message& message) { // If this is developer tools renderer intercept tools messages first. if (devtools_client_.get() && devtools_client_->OnMessageReceived(message)) return; - if (devtools_agent_.get() && devtools_agent_->OnMessageReceived(message)) + if (devtools_agent_->OnMessageReceived(message)) return; IPC_BEGIN_MESSAGE_MAP(RenderView, message) |