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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 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 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/power/power_event_observer.h" 5 #include "ash/system/power/power_event_observer.h"
6 6
7 #include "ash/session/session_controller.h" 7 #include "ash/session/session_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_port.h"
9 #include "ash/system/tray/system_tray_notifier.h" 10 #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 "ash/wm_shell.h"
12 #include "chromeos/dbus/dbus_thread_manager.h" 12 #include "chromeos/dbus/dbus_thread_manager.h"
13 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
14 #include "ui/aura/window_tree_host.h" 14 #include "ui/aura/window_tree_host.h"
15 #include "ui/base/user_activity/user_activity_detector.h" 15 #include "ui/base/user_activity/user_activity_detector.h"
16 #include "ui/compositor/compositor.h" 16 #include "ui/compositor/compositor.h"
17 #include "ui/display/manager/chromeos/display_configurator.h" 17 #include "ui/display/manager/chromeos/display_configurator.h"
18 18
19 namespace ash { 19 namespace ash {
20 20
21 namespace { 21 namespace {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 } else { 114 } else {
115 // The lock-before-suspending pref is not set or the screen has already been 115 // The lock-before-suspending pref is not set or the screen has already been
116 // locked and the animations have completed. Rendering can be stopped now. 116 // locked and the animations have completed. Rendering can be stopped now.
117 StopRenderingRequests(); 117 StopRenderingRequests();
118 } 118 }
119 119
120 ui::UserActivityDetector::Get()->OnDisplayPowerChanging(); 120 ui::UserActivityDetector::Get()->OnDisplayPowerChanging();
121 121
122 // TODO(derat): After mus exposes a method for suspending displays, call it 122 // TODO(derat): After mus exposes a method for suspending displays, call it
123 // here: http://crbug.com/692193 123 // here: http://crbug.com/692193
124 if (!WmShell::Get()->IsRunningInMash()) { 124 if (!ShellPort::Get()->IsRunningInMash()) {
125 Shell::Get()->display_configurator()->SuspendDisplays(base::Bind( 125 Shell::Get()->display_configurator()->SuspendDisplays(base::Bind(
126 &OnSuspendDisplaysCompleted, chromeos::DBusThreadManager::Get() 126 &OnSuspendDisplaysCompleted, chromeos::DBusThreadManager::Get()
127 ->GetPowerManagerClient() 127 ->GetPowerManagerClient()
128 ->GetSuspendReadinessCallback())); 128 ->GetSuspendReadinessCallback()));
129 } 129 }
130 } 130 }
131 131
132 void PowerEventObserver::SuspendDone(const base::TimeDelta& sleep_duration) { 132 void PowerEventObserver::SuspendDone(const base::TimeDelta& sleep_duration) {
133 // TODO(derat): After mus exposes a method for resuming displays, call it 133 // TODO(derat): After mus exposes a method for resuming displays, call it
134 // here: http://crbug.com/692193 134 // here: http://crbug.com/692193
135 if (!WmShell::Get()->IsRunningInMash()) 135 if (!ShellPort::Get()->IsRunningInMash())
136 Shell::Get()->display_configurator()->ResumeDisplays(); 136 Shell::Get()->display_configurator()->ResumeDisplays();
137 Shell::Get()->system_tray_notifier()->NotifyRefreshClock(); 137 Shell::Get()->system_tray_notifier()->NotifyRefreshClock();
138 138
139 // If the suspend request was being blocked while waiting for the lock 139 // If the suspend request was being blocked while waiting for the lock
140 // animation to complete, clear the blocker since the suspend has already 140 // animation to complete, clear the blocker since the suspend has already
141 // completed. This prevents rendering requests from being blocked after a 141 // completed. This prevents rendering requests from being blocked after a
142 // resume if the lock screen took too long to show. 142 // resume if the lock screen took too long to show.
143 screen_lock_callback_.Reset(); 143 screen_lock_callback_.Reset();
144 144
145 ResumeRenderingRequests(); 145 ResumeRenderingRequests();
(...skipping 10 matching lines...) Expand all
156 } else { 156 } else {
157 VLOG(1) << "Screen locked without suspend"; 157 VLOG(1) << "Screen locked without suspend";
158 } 158 }
159 } 159 }
160 160
161 void PowerEventObserver::ScreenIsUnlocked() { 161 void PowerEventObserver::ScreenIsUnlocked() {
162 screen_locked_ = false; 162 screen_locked_ = false;
163 } 163 }
164 164
165 } // namespace ash 165 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698