chrome/browser/extensions/api/settings_private/settings_private_event_router.cc - Issue 1827083005: [Extensions] Convert APIs to use movable types [9]

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/extensions/api/settings_private/settings_private_event_router.cc

Issue 1827083005: [Extensions] Convert APIs to use movable types [9] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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/extensions/api/sessions/sessions_api.cc ('k') | chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/settings_private/settings_private_event_router.cc

diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc b/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc

index 4218b63cda1a2ce52a1e7c3038ee9e295590ed71..f51f6dba327293dbfb8cca3f37364160bbebae26 100644

--- a/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc

+++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc

@@ -131,11 +131,12 @@ void SettingsPrivateEventRouter::OnPreferenceChanged(

return;

}

- api::settings_private::PrefObject* pref_object =

- prefs_util_->GetPref(pref_name).release();

+ scoped_ptr<api::settings_private::PrefObject> pref_object =

+ prefs_util_->GetPref(pref_name);

- std::vector<linked_ptr<api::settings_private::PrefObject>> prefs;

- prefs.push_back(linked_ptr<api::settings_private::PrefObject>(pref_object));

+ std::vector<api::settings_private::PrefObject> prefs;

+ if (pref_object)

+ prefs.push_back(std::move(*pref_object));

scoped_ptr<base::ListValue> args(

api::settings_private::OnPrefsChanged::Create(prefs));