components/proximity_auth/screenlock_bridge.cc - Issue 1912433002: Convert //components/proximity_auth from scoped_ptr to std::unique_ptr

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: components/proximity_auth/screenlock_bridge.cc

Issue 1912433002: Convert //components/proximity_auth from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« components/proximity_auth/messenger_observer.h ('K') | « components/proximity_auth/screenlock_bridge.h ('k') | components/proximity_auth/throttled_bluetooth_connection_finder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/proximity_auth/screenlock_bridge.cc

diff --git a/components/proximity_auth/screenlock_bridge.cc b/components/proximity_auth/screenlock_bridge.cc

index e95a0a70229e489cb194e38067a651f853289a1b..3a9411483f1c9fe4e8cd9648fb0a75ec4a3c0cc2 100644

--- a/components/proximity_auth/screenlock_bridge.cc

+++ b/components/proximity_auth/screenlock_bridge.cc

@@ -61,9 +61,9 @@ ScreenlockBridge::UserPodCustomIconOptions::UserPodCustomIconOptions()

ScreenlockBridge::UserPodCustomIconOptions::~UserPodCustomIconOptions() {

}

-scoped_ptr<base::DictionaryValue>

+std::unique_ptr<base::DictionaryValue>

ScreenlockBridge::UserPodCustomIconOptions::ToDictionaryValue() const {

- scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());

+ std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());

std::string icon_id = GetIdForIcon(icon_);

result->SetString("id", icon_id);