Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/power/power_button_observer.h" 5 #include "chrome/browser/chromeos/power/power_button_observer.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/system/user/login_status.h" 9 #include "ash/system/user/login_status.h"
10 #include "ash/wm/power_button_controller.h" 10 #include "ash/wm/power_button_controller.h"
(...skipping 18 matching lines...) Expand all
29 return ash::Shell::GetInstance()->system_tray_delegate()-> 29 return ash::Shell::GetInstance()->system_tray_delegate()->
30 GetUserLoginStatus(); 30 GetUserLoginStatus();
31 } 31 }
32 32
33 } // namespace 33 } // namespace
34 34
35 PowerButtonObserver::PowerButtonObserver() { 35 PowerButtonObserver::PowerButtonObserver() {
36 // TODO: Remove after resolving crbug.com/452599. 36 // TODO: Remove after resolving crbug.com/452599.
37 VLOG(0) << "Creating PowerButtonObserver " << this; 37 VLOG(0) << "Creating PowerButtonObserver " << this;
38 38
39 ash::Shell::GetInstance()->lock_state_controller()-> 39 ash::Shell::GetInstance()->lock_state_controller()->SetDelegate(
40 SetDelegate(scoped_ptr<ash::LockStateControllerDelegate>( 40 std::unique_ptr<ash::LockStateControllerDelegate>(
41 new SessionStateControllerDelegateChromeos)); 41 new SessionStateControllerDelegateChromeos));
42 42
43 registrar_.Add( 43 registrar_.Add(
44 this, 44 this,
45 chrome::NOTIFICATION_LOGIN_USER_CHANGED, 45 chrome::NOTIFICATION_LOGIN_USER_CHANGED,
46 content::NotificationService::AllSources()); 46 content::NotificationService::AllSources());
47 registrar_.Add( 47 registrar_.Add(
48 this, 48 this,
49 chrome::NOTIFICATION_APP_TERMINATING, 49 chrome::NOTIFICATION_APP_TERMINATING,
50 content::NotificationService::AllSources()); 50 content::NotificationService::AllSources());
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 } 96 }
97 } 97 }
98 98
99 void PowerButtonObserver::PowerButtonEventReceived( 99 void PowerButtonObserver::PowerButtonEventReceived(
100 bool down, const base::TimeTicks& timestamp) { 100 bool down, const base::TimeTicks& timestamp) {
101 ash::Shell::GetInstance()->power_button_controller()-> 101 ash::Shell::GetInstance()->power_button_controller()->
102 OnPowerButtonEvent(down, timestamp); 102 OnPowerButtonEvent(down, timestamp);
103 } 103 }
104 104
105 } // namespace chromeos 105 } // namespace chromeos
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698