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

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

Issue 502203002: Remove implicit conversions from scoped_refptr to T* in content/browser/devtools/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 131
132 void RenderViewDevToolsAgentHost::DispatchProtocolMessage( 132 void RenderViewDevToolsAgentHost::DispatchProtocolMessage(
133 const std::string& message) { 133 const std::string& message) {
134 std::string error_message; 134 std::string error_message;
135 135
136 scoped_ptr<base::DictionaryValue> message_dict( 136 scoped_ptr<base::DictionaryValue> message_dict(
137 DevToolsProtocol::ParseMessage(message, &error_message)); 137 DevToolsProtocol::ParseMessage(message, &error_message));
138 scoped_refptr<DevToolsProtocol::Command> command = 138 scoped_refptr<DevToolsProtocol::Command> command =
139 DevToolsProtocol::ParseCommand(message_dict.get(), &error_message); 139 DevToolsProtocol::ParseCommand(message_dict.get(), &error_message);
140 140
141 if (command) { 141 if (command.get()) {
142 scoped_refptr<DevToolsProtocol::Response> overridden_response; 142 scoped_refptr<DevToolsProtocol::Response> overridden_response;
143 143
144 DevToolsManagerDelegate* delegate = 144 DevToolsManagerDelegate* delegate =
145 DevToolsManagerImpl::GetInstance()->delegate(); 145 DevToolsManagerImpl::GetInstance()->delegate();
146 if (delegate) { 146 if (delegate) {
147 scoped_ptr<base::DictionaryValue> overridden_response_value( 147 scoped_ptr<base::DictionaryValue> overridden_response_value(
148 delegate->HandleCommand(this, message_dict.get())); 148 delegate->HandleCommand(this, message_dict.get()));
149 if (overridden_response_value) 149 if (overridden_response_value)
150 overridden_response = DevToolsProtocol::ParseResponse( 150 overridden_response = DevToolsProtocol::ParseResponse(
151 overridden_response_value.get()); 151 overridden_response_value.get());
152 } 152 }
153 if (!overridden_response) 153 if (!overridden_response.get())
154 overridden_response = overrides_handler_->HandleCommand(command); 154 overridden_response = overrides_handler_->HandleCommand(command);
155 if (!overridden_response) 155 if (!overridden_response.get())
156 overridden_response = tracing_handler_->HandleCommand(command); 156 overridden_response = tracing_handler_->HandleCommand(command);
157 if (!overridden_response) 157 if (!overridden_response.get())
158 overridden_response = power_handler_->HandleCommand(command); 158 overridden_response = power_handler_->HandleCommand(command);
159 if (overridden_response) { 159 if (overridden_response.get()) {
160 if (!overridden_response->is_async_promise()) 160 if (!overridden_response->is_async_promise())
161 OnDispatchOnInspectorFrontend(overridden_response->Serialize()); 161 OnDispatchOnInspectorFrontend(overridden_response->Serialize());
162 return; 162 return;
163 } 163 }
164 } 164 }
165 165
166 IPCDevToolsAgentHost::DispatchProtocolMessage(message); 166 IPCDevToolsAgentHost::DispatchProtocolMessage(message);
167 } 167 }
168 168
169 void RenderViewDevToolsAgentHost::SendMessageToAgent(IPC::Message* msg) { 169 void RenderViewDevToolsAgentHost::SendMessageToAgent(IPC::Message* msg) {
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 } 471 }
472 472
473 void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend( 473 void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend(
474 const std::string& message) { 474 const std::string& message) {
475 if (!render_view_host_) 475 if (!render_view_host_)
476 return; 476 return;
477 477
478 scoped_refptr<DevToolsProtocol::Notification> notification = 478 scoped_refptr<DevToolsProtocol::Notification> notification =
479 DevToolsProtocol::ParseNotification(message); 479 DevToolsProtocol::ParseNotification(message);
480 480
481 if (notification) { 481 if (notification.get()) {
482 tracing_handler_->HandleNotification(notification); 482 tracing_handler_->HandleNotification(notification);
483 } 483 }
484 SendMessageToClient(message); 484 SendMessageToClient(message);
485 } 485 }
486 486
487 } // namespace content 487 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698