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

Side by Side Diff: content/browser/devtools/render_view_devtools_agent_host.cc

Issue 635733003: [DevTools] Migrate DevToolsTracingHandler to generated handler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/devtools/render_view_devtools_agent_host.h" 5 #include "content/browser/devtools/render_view_devtools_agent_host.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
11 #include "content/browser/devtools/devtools_manager.h" 11 #include "content/browser/devtools/devtools_manager.h"
12 #include "content/browser/devtools/devtools_power_handler.h" 12 #include "content/browser/devtools/devtools_power_handler.h"
13 #include "content/browser/devtools/devtools_protocol.h" 13 #include "content/browser/devtools/devtools_protocol.h"
14 #include "content/browser/devtools/devtools_protocol_constants.h" 14 #include "content/browser/devtools/devtools_protocol_constants.h"
15 #include "content/browser/devtools/devtools_tracing_handler.h"
16 #include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h" 15 #include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
17 #include "content/browser/devtools/renderer_overrides_handler.h" 16 #include "content/browser/devtools/renderer_overrides_handler.h"
18 #include "content/browser/renderer_host/render_process_host_impl.h" 17 #include "content/browser/renderer_host/render_process_host_impl.h"
19 #include "content/browser/renderer_host/render_view_host_impl.h" 18 #include "content/browser/renderer_host/render_view_host_impl.h"
20 #include "content/browser/site_instance_impl.h" 19 #include "content/browser/site_instance_impl.h"
21 #include "content/browser/web_contents/web_contents_impl.h" 20 #include "content/browser/web_contents/web_contents_impl.h"
22 #include "content/common/devtools_messages.h" 21 #include "content/common/devtools_messages.h"
23 #include "content/common/view_messages.h" 22 #include "content/common/view_messages.h"
24 #include "content/public/browser/content_browser_client.h" 23 #include "content/public/browser/content_browser_client.h"
25 #include "content/public/browser/devtools_manager_delegate.h" 24 #include "content/public/browser/devtools_manager_delegate.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 if (!agent_host) 104 if (!agent_host)
106 return; 105 return;
107 agent_host->DisconnectRenderViewHost(); 106 agent_host->DisconnectRenderViewHost();
108 agent_host->ConnectRenderViewHost(current); 107 agent_host->ConnectRenderViewHost(current);
109 } 108 }
110 109
111 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh) 110 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)
112 : render_view_host_(NULL), 111 : render_view_host_(NULL),
113 input_handler_(new devtools::input::InputHandler()), 112 input_handler_(new devtools::input::InputHandler()),
114 page_handler_(new devtools::page::PageHandler()), 113 page_handler_(new devtools::page::PageHandler()),
114 tracing_handler_(new devtools::tracing::TracingHandler(
115 devtools::tracing::TracingHandler::Renderer)),
115 handler_impl_(new DevToolsProtocolHandlerImpl()), 116 handler_impl_(new DevToolsProtocolHandlerImpl()),
116 overrides_handler_(new RendererOverridesHandler()), 117 overrides_handler_(new RendererOverridesHandler()),
117 tracing_handler_(
118 new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)),
119 power_handler_(new DevToolsPowerHandler()), 118 power_handler_(new DevToolsPowerHandler()),
120 reattaching_(false) { 119 reattaching_(false) {
121 handler_impl_->SetInputHandler(input_handler_.get()); 120 handler_impl_->SetInputHandler(input_handler_.get());
122 handler_impl_->SetPageHandler(page_handler_.get()); 121 handler_impl_->SetPageHandler(page_handler_.get());
122 handler_impl_->SetTracingHandler(tracing_handler_.get());
123 SetRenderViewHost(rvh); 123 SetRenderViewHost(rvh);
124 DevToolsProtocol::Notifier notifier(base::Bind( 124 DevToolsProtocol::Notifier notifier(base::Bind(
125 &RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend, 125 &RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend,
126 base::Unretained(this))); 126 base::Unretained(this)));
127 handler_impl_->SetNotifier(notifier); 127 handler_impl_->SetNotifier(notifier);
128 overrides_handler_->SetNotifier(notifier); 128 overrides_handler_->SetNotifier(notifier);
129 tracing_handler_->SetNotifier(notifier);
130 power_handler_->SetNotifier(notifier); 129 power_handler_->SetNotifier(notifier);
131 g_instances.Get().push_back(this); 130 g_instances.Get().push_back(this);
132 AddRef(); // Balanced in RenderViewHostDestroyed. 131 AddRef(); // Balanced in RenderViewHostDestroyed.
133 DevToolsManager::GetInstance()->AgentHostChanged(this); 132 DevToolsManager::GetInstance()->AgentHostChanged(this);
134 } 133 }
135 134
136 WebContents* RenderViewDevToolsAgentHost::GetWebContents() { 135 WebContents* RenderViewDevToolsAgentHost::GetWebContents() {
137 return web_contents(); 136 return web_contents();
138 } 137 }
139 138
(...skipping 14 matching lines...) Expand all
154 if (delegate) { 153 if (delegate) {
155 scoped_ptr<base::DictionaryValue> overridden_response_value( 154 scoped_ptr<base::DictionaryValue> overridden_response_value(
156 delegate->HandleCommand(this, message_dict.get())); 155 delegate->HandleCommand(this, message_dict.get()));
157 if (overridden_response_value) 156 if (overridden_response_value)
158 overridden_response = DevToolsProtocol::ParseResponse( 157 overridden_response = DevToolsProtocol::ParseResponse(
159 overridden_response_value.get()); 158 overridden_response_value.get());
160 } 159 }
161 if (!overridden_response.get()) 160 if (!overridden_response.get())
162 overridden_response = overrides_handler_->HandleCommand(command); 161 overridden_response = overrides_handler_->HandleCommand(command);
163 if (!overridden_response.get()) 162 if (!overridden_response.get())
164 overridden_response = tracing_handler_->HandleCommand(command);
165 if (!overridden_response.get())
166 overridden_response = power_handler_->HandleCommand(command); 163 overridden_response = power_handler_->HandleCommand(command);
167 if (!overridden_response.get()) 164 if (!overridden_response.get())
168 overridden_response = handler_impl_->HandleCommand(command); 165 overridden_response = handler_impl_->HandleCommand(command);
169 if (overridden_response.get()) { 166 if (overridden_response.get()) {
170 if (!overridden_response->is_async_promise()) 167 if (!overridden_response->is_async_promise())
171 OnDispatchOnInspectorFrontend(overridden_response->Serialize()); 168 OnDispatchOnInspectorFrontend(overridden_response->Serialize());
172 return; 169 return;
173 } 170 }
174 } 171 }
175 172
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 InitDisplaySleepBlocker(render_view_host_->GetView()->GetNativeView()); 207 InitDisplaySleepBlocker(render_view_host_->GetView()->GetNativeView());
211 } 208 }
212 #endif 209 #endif
213 } 210 }
214 211
215 void RenderViewDevToolsAgentHost::OnClientDetached() { 212 void RenderViewDevToolsAgentHost::OnClientDetached() {
216 #if defined(OS_ANDROID) 213 #if defined(OS_ANDROID)
217 power_save_blocker_.reset(); 214 power_save_blocker_.reset();
218 #endif 215 #endif
219 overrides_handler_->OnClientDetached(); 216 overrides_handler_->OnClientDetached();
220 tracing_handler_->OnClientDetached(); 217 tracing_handler_->Detached();
221 power_handler_->OnClientDetached(); 218 power_handler_->OnClientDetached();
222 ClientDetachedFromRenderer(); 219 ClientDetachedFromRenderer();
223 220
224 // TODO(kaznacheev): Move this call back to DevToolsManager when 221 // TODO(kaznacheev): Move this call back to DevToolsManager when
225 // extensions::ProcessManager no longer relies on this notification. 222 // extensions::ProcessManager no longer relies on this notification.
226 if (!reattaching_) 223 if (!reattaching_)
227 DevToolsAgentHostImpl::NotifyCallbacks(this, false); 224 DevToolsAgentHostImpl::NotifyCallbacks(this, false);
228 } 225 }
229 226
230 void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() { 227 void RenderViewDevToolsAgentHost::ClientDetachedFromRenderer() {
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 } 493 }
497 494
498 void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend( 495 void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend(
499 const std::string& message) { 496 const std::string& message) {
500 if (!render_view_host_) 497 if (!render_view_host_)
501 return; 498 return;
502 SendMessageToClient(message); 499 SendMessageToClient(message);
503 } 500 }
504 501
505 } // namespace content 502 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698