chrome/browser/extensions/api/settings_private/prefs_util.cc - Issue 1556783002: Convert Pass()→std::move() for CrOS extension code.

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/prefs_util.cc

Issue 1556783002: Convert Pass()→std::move() for CrOS extension code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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

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

index cb9ad42192c1377f66283d042690bbc2b82f5301..ec1018471f8bfcf1edaa401ae8049c30698278b0 100644

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

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

@@ -284,7 +284,7 @@ scoped_ptr<settings_private::PrefObject> PrefsUtil::GetPref(

settings_private::PolicyEnforcement::POLICY_ENFORCEMENT_ENFORCED;

pref_object->policy_source_name.reset(new std::string(

user_manager::UserManager::Get()->GetPrimaryUser()->email()));

- return pref_object.Pass();

+ return pref_object;

}

if (IsPrefEnterpriseManaged(name)) {

// Enterprise managed prefs are treated the same as device policy restricted

@@ -293,7 +293,7 @@ scoped_ptr<settings_private::PrefObject> PrefsUtil::GetPref(

settings_private::PolicySource::POLICY_SOURCE_DEVICE_POLICY;

pref_object->policy_enforcement =

settings_private::PolicyEnforcement::POLICY_ENFORCEMENT_ENFORCED;

- return pref_object.Pass();

+ return pref_object;

}

#endif

@@ -326,7 +326,7 @@ scoped_ptr<settings_private::PrefObject> PrefsUtil::GetPref(

settings_private::PolicyEnforcement::POLICY_ENFORCEMENT_ENFORCED;

pref_object->policy_source_name.reset(new std::string(

user_manager::UserManager::Get()->GetOwnerAccountId().GetUserEmail()));

- return pref_object.Pass();

+ return pref_object;

}

#endif