content/browser/devtools/devtools_http_handler_impl.cc - Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/devtools/devtools_http_handler_impl.cc

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/devtools/devtools_external_agent_proxy_impl.cc ('k') | content/browser/devtools/devtools_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/devtools_http_handler_impl.cc

diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc

index 89a40dd493fa74cc0b67943ed9fc709c053c0da0..112981344d7a8f23366c6885e94abca6213bbe09 100644

--- a/content/browser/devtools/devtools_http_handler_impl.cc

+++ b/content/browser/devtools/devtools_http_handler_impl.cc

@@ -641,10 +641,8 @@ void DevToolsHttpHandlerImpl::OnWebSocketRequestUI(

return;

}

- DevToolsClientHostImpl* client_host =

- new DevToolsClientHostImpl(thread_->message_loop(),

- server_,

- connection_id);

+ DevToolsClientHostImpl* client_host = new DevToolsClientHostImpl(

+ thread_->message_loop(), server_.get(), connection_id);

connection_to_client_host_ui_[connection_id] = client_host;

DevToolsManager::GetInstance()->

@@ -818,7 +816,7 @@ base::DictionaryValue* DevToolsHttpHandlerImpl::SerializePageInfo(

scoped_refptr<DevToolsAgentHost> agent(

DevToolsAgentHost::GetOrCreateFor(rvh));

- std::string id = binding_->GetIdentifier(agent);

+ std::string id = binding_->GetIdentifier(agent.get());

dictionary->SetString(kTargetIdField, id);

switch (delegate_->GetTargetType(rvh)) {

@@ -860,7 +858,7 @@ base::DictionaryValue* DevToolsHttpHandlerImpl::SerializeWorkerInfo(

scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetForWorker(

worker.process_id, worker.route_id));

- std::string id = binding_->GetIdentifier(agent);

+ std::string id = binding_->GetIdentifier(agent.get());

dictionary->SetString(kTargetIdField, id);

dictionary->SetString(kTargetTypeField, kTargetTypeOther);