chrome/browser/chromeos/power/power_button_observer.cc - Issue 1870793002: Convert //chrome/browser/chromeos 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: chrome/browser/chromeos/power/power_button_observer.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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

« no previous file with comments | « chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc ('k') | chrome/browser/chromeos/power/power_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/power/power_button_observer.cc

diff --git a/chrome/browser/chromeos/power/power_button_observer.cc b/chrome/browser/chromeos/power/power_button_observer.cc

index 7e3868c2bb09dbf02042d4367341a09025ec8310..5a3ffc980a07ce5b0df73e9494962e1a5d569a68 100644

--- a/chrome/browser/chromeos/power/power_button_observer.cc

+++ b/chrome/browser/chromeos/power/power_button_observer.cc

@@ -36,8 +36,8 @@ PowerButtonObserver::PowerButtonObserver() {

// TODO: Remove after resolving crbug.com/452599.

VLOG(0) << "Creating PowerButtonObserver " << this;

- ash::Shell::GetInstance()->lock_state_controller()->

- SetDelegate(scoped_ptr<ash::LockStateControllerDelegate>(

+ ash::Shell::GetInstance()->lock_state_controller()->SetDelegate(

+ std::unique_ptr<ash::LockStateControllerDelegate>(

new SessionStateControllerDelegateChromeos));

registrar_.Add(