chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc - Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions

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: chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix bad merge Created 5 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 | « chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc ('k') | chrome/browser/ui/webui/options/certificate_manager_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

index 4a0c70c17b8a743cd0088fee68d4b70bfbb6c289..5c32f9a6871788897623f70eb05890cfd5fdbe5e 100644

--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

@@ -370,7 +370,7 @@ void LocalDiscoveryUIHandler::DeviceChanged(

web_ui()->CallJavascriptFunction(

"local_discovery.onUnregisteredDeviceUpdate", service_key, info);

} else {

- scoped_ptr<base::Value> null_value(base::Value::CreateNullValue());

+ scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();

web_ui()->CallJavascriptFunction(

"local_discovery.onUnregisteredDeviceUpdate", service_key, *null_value);

@@ -379,7 +379,7 @@ void LocalDiscoveryUIHandler::DeviceChanged(

void LocalDiscoveryUIHandler::DeviceRemoved(const std::string& name) {

device_descriptions_.erase(name);

- scoped_ptr<base::Value> null_value(base::Value::CreateNullValue());

+ scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();

base::StringValue name_value(kKeyPrefixMDns + name);

web_ui()->CallJavascriptFunction("local_discovery.onUnregisteredDeviceUpdate",