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

Side by Side Diff: ash/system/chromeos/power/power_event_observer.cc

Issue 240343004: chromeos: Update IdleActionImminent and SuspendDone handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/system/chromeos/power/power_event_observer.h" 5 #include "ash/system/chromeos/power/power_event_observer.h"
6 6
7 #include "ash/session_state_delegate.h" 7 #include "ash/session_state_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/tray/system_tray_notifier.h" 9 #include "ash/system/tray/system_tray_notifier.h"
10 #include "ash/wm/power_button_controller.h" 10 #include "ash/wm/power_button_controller.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 GetPowerManagerClient()->GetSuspendReadinessCallback(); 47 GetPowerManagerClient()->GetSuspendReadinessCallback();
48 VLOG(1) << "Requesting screen lock from PowerEventObserver"; 48 VLOG(1) << "Requesting screen lock from PowerEventObserver";
49 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 49 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
50 RequestLockScreen(); 50 RequestLockScreen();
51 } 51 }
52 52
53 shell->user_activity_detector()->OnDisplayPowerChanging(); 53 shell->user_activity_detector()->OnDisplayPowerChanging();
54 shell->display_configurator()->SuspendDisplays(); 54 shell->display_configurator()->SuspendDisplays();
55 } 55 }
56 56
57 void PowerEventObserver::SystemResumed(const base::TimeDelta& sleep_duration) { 57 void PowerEventObserver::SuspendDone(const base::TimeDelta& sleep_duration) {
58 Shell::GetInstance()->display_configurator()->ResumeDisplays(); 58 Shell::GetInstance()->display_configurator()->ResumeDisplays();
59 Shell::GetInstance()->system_tray_notifier()->NotifyRefreshClock(); 59 Shell::GetInstance()->system_tray_notifier()->NotifyRefreshClock();
60 } 60 }
61 61
62 void PowerEventObserver::ScreenIsLocked() { 62 void PowerEventObserver::ScreenIsLocked() {
63 screen_locked_ = true; 63 screen_locked_ = true;
64 64
65 // Stop blocking suspend after the screen is locked. 65 // Stop blocking suspend after the screen is locked.
66 if (!screen_lock_callback_.is_null()) { 66 if (!screen_lock_callback_.is_null()) {
67 VLOG(1) << "Screen locked due to suspend"; 67 VLOG(1) << "Screen locked due to suspend";
68 // Run the callback asynchronously. ScreenIsLocked() is currently 68 // Run the callback asynchronously. ScreenIsLocked() is currently
69 // called asynchronously after RequestLockScreen(), but this guards 69 // called asynchronously after RequestLockScreen(), but this guards
70 // against it being made synchronous later. 70 // against it being made synchronous later.
71 base::MessageLoop::current()->PostTask(FROM_HERE, screen_lock_callback_); 71 base::MessageLoop::current()->PostTask(FROM_HERE, screen_lock_callback_);
72 screen_lock_callback_.Reset(); 72 screen_lock_callback_.Reset();
73 } else { 73 } else {
74 VLOG(1) << "Screen locked without suspend"; 74 VLOG(1) << "Screen locked without suspend";
75 } 75 }
76 } 76 }
77 77
78 void PowerEventObserver::ScreenIsUnlocked() { 78 void PowerEventObserver::ScreenIsUnlocked() {
79 screen_locked_ = false; 79 screen_locked_ = false;
80 } 80 }
81 81
82 } // namespace ash 82 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698