chrome/browser/chromeos/policy/device_status_collector.cc - Issue 1557693002: Convert Pass()→std::move() in //chrome/browser/chromeos/policy

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/chromeos/policy/device_status_collector.cc

Issue 1557693002: Convert Pass()→std::move() in //chrome/browser/chromeos/policy (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/chromeos/policy/device_network_configuration_updater.cc ('k') | chrome/browser/chromeos/policy/device_status_collector_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_status_collector.cc

diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc

index bc0d2e3412073193a3c7288154da724b92dad429..ae70fac63b637df43a81c91f602492a4490a3871 100644

--- a/chrome/browser/chromeos/policy/device_status_collector.cc

+++ b/chrome/browser/chromeos/policy/device_status_collector.cc

@@ -226,7 +226,7 @@ GetCurrentKioskDeviceLocalAccount(chromeos::CrosSettings* settings) {

if (AccountId::FromUserEmail(device_local_account.user_id) ==

user->GetAccountId()) {

return make_scoped_ptr(

- new policy::DeviceLocalAccount(device_local_account)).Pass();

+ new policy::DeviceLocalAccount(device_local_account));

}

LOG(WARNING) << "Kiosk app not found in list of device-local accounts";

@@ -540,7 +540,7 @@ DeviceStatusCollector::GetAutoLaunchedKioskSessionInfo() {

if (chromeos::KioskAppManager::Get()->GetApp(account->kiosk_app_id,

&current_app) &&

current_app.was_auto_launched_with_zero_delay) {

- return account.Pass();

+ return account;

}

// No auto-launched kiosk session active.