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

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

Issue 2064953002: mash: Migrate tray date view to //ash/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayviews
Patch Set: review feedback Created 4 years, 6 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
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/system/chromeos/system_clock_observer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/session/session_state_delegate.h" 7 #include "ash/common/session/session_state_delegate.h"
8 #include "ash/common/system/tray/wm_system_tray_notifier.h"
9 #include "ash/common/wm_shell.h"
8 #include "ash/shell.h" 10 #include "ash/shell.h"
9 #include "ash/system/tray/system_tray_notifier.h"
10 #include "ash/wm/power_button_controller.h" 11 #include "ash/wm/power_button_controller.h"
11 #include "chromeos/dbus/dbus_thread_manager.h" 12 #include "chromeos/dbus/dbus_thread_manager.h"
12 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
13 #include "ui/aura/window_tree_host.h" 14 #include "ui/aura/window_tree_host.h"
14 #include "ui/base/user_activity/user_activity_detector.h" 15 #include "ui/base/user_activity/user_activity_detector.h"
15 #include "ui/compositor/compositor.h" 16 #include "ui/compositor/compositor.h"
16 #include "ui/display/chromeos/display_configurator.h" 17 #include "ui/display/chromeos/display_configurator.h"
17 18
18 namespace ash { 19 namespace ash {
19 20
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 119
119 ui::UserActivityDetector::Get()->OnDisplayPowerChanging(); 120 ui::UserActivityDetector::Get()->OnDisplayPowerChanging();
120 shell->display_configurator()->SuspendDisplays(base::Bind( 121 shell->display_configurator()->SuspendDisplays(base::Bind(
121 &OnSuspendDisplaysCompleted, chromeos::DBusThreadManager::Get() 122 &OnSuspendDisplaysCompleted, chromeos::DBusThreadManager::Get()
122 ->GetPowerManagerClient() 123 ->GetPowerManagerClient()
123 ->GetSuspendReadinessCallback())); 124 ->GetSuspendReadinessCallback()));
124 } 125 }
125 126
126 void PowerEventObserver::SuspendDone(const base::TimeDelta& sleep_duration) { 127 void PowerEventObserver::SuspendDone(const base::TimeDelta& sleep_duration) {
127 Shell::GetInstance()->display_configurator()->ResumeDisplays(); 128 Shell::GetInstance()->display_configurator()->ResumeDisplays();
128 Shell::GetInstance()->system_tray_notifier()->NotifyRefreshClock(); 129 WmShell::Get()->system_tray_notifier()->NotifyRefreshClock();
129 130
130 // If the suspend request was being blocked while waiting for the lock 131 // If the suspend request was being blocked while waiting for the lock
131 // animation to complete, clear the blocker since the suspend has already 132 // animation to complete, clear the blocker since the suspend has already
132 // completed. This prevents rendering requests from being blocked after a 133 // completed. This prevents rendering requests from being blocked after a
133 // resume if the lock screen took too long to show. 134 // resume if the lock screen took too long to show.
134 screen_lock_callback_.Reset(); 135 screen_lock_callback_.Reset();
135 136
136 ResumeRenderingRequests(); 137 ResumeRenderingRequests();
137 } 138 }
138 139
139 void PowerEventObserver::ScreenIsLocked() { 140 void PowerEventObserver::ScreenIsLocked() {
140 screen_locked_ = true; 141 screen_locked_ = true;
141 waiting_for_lock_screen_animations_ = true; 142 waiting_for_lock_screen_animations_ = true;
142 143
143 // The screen is now locked but the pending suspend, if any, will be blocked 144 // The screen is now locked but the pending suspend, if any, will be blocked
144 // until all the animations have completed. 145 // until all the animations have completed.
145 if (!screen_lock_callback_.is_null()) { 146 if (!screen_lock_callback_.is_null()) {
146 VLOG(1) << "Screen locked due to suspend"; 147 VLOG(1) << "Screen locked due to suspend";
147 } else { 148 } else {
148 VLOG(1) << "Screen locked without suspend"; 149 VLOG(1) << "Screen locked without suspend";
149 } 150 }
150 } 151 }
151 152
152 void PowerEventObserver::ScreenIsUnlocked() { 153 void PowerEventObserver::ScreenIsUnlocked() {
153 screen_locked_ = false; 154 screen_locked_ = false;
154 } 155 }
155 156
156 } // namespace ash 157 } // namespace ash
OLDNEW
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/system/chromeos/system_clock_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698