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

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

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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/shell_unittest.cc ('k') | ash/system/chromeos/power/power_event_observer_unittest.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_controller.h"
8 #include "ash/common/system/tray/system_tray_notifier.h" 8 #include "ash/common/system/tray/system_tray_notifier.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/wm/power_button_controller.h" 11 #include "ash/wm/power_button_controller.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"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 screen_lock_callback_.Reset(); 69 screen_lock_callback_.Reset();
70 } 70 }
71 } 71 }
72 72
73 void PowerEventObserver::BrightnessChanged(int level, bool user_initiated) { 73 void PowerEventObserver::BrightnessChanged(int level, bool user_initiated) {
74 Shell::GetInstance()->power_button_controller()->OnScreenBrightnessChanged( 74 Shell::GetInstance()->power_button_controller()->OnScreenBrightnessChanged(
75 static_cast<double>(level)); 75 static_cast<double>(level));
76 } 76 }
77 77
78 void PowerEventObserver::SuspendImminent() { 78 void PowerEventObserver::SuspendImminent() {
79 SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate(); 79 SessionController* controller = WmShell::Get()->session_controller();
80 80
81 // This class is responsible for disabling all rendering requests at suspend 81 // This class is responsible for disabling all rendering requests at suspend
82 // time and then enabling them at resume time. When the 82 // time and then enabling them at resume time. When the
83 // auto-screen-lock pref is not set this is easy to do since 83 // auto-screen-lock pref is not set this is easy to do since
84 // StopRenderingRequests() is just called directly from this function. If the 84 // StopRenderingRequests() is just called directly from this function. If the
85 // auto-screen-lock pref _is_ set, then the suspend needs to be delayed 85 // auto-screen-lock pref _is_ set, then the suspend needs to be delayed
86 // until the lock screen is fully visible. While it is sufficient from a 86 // until the lock screen is fully visible. While it is sufficient from a
87 // security perspective to block only until the lock screen is ready, which 87 // security perspective to block only until the lock screen is ready, which
88 // guarantees that the contents of the user's screen are no longer visible, 88 // guarantees that the contents of the user's screen are no longer visible,
89 // this leads to poor UX on the first resume since neither the user pod nor 89 // this leads to poor UX on the first resume since neither the user pod nor
90 // the header bar will be visible for a few hundred milliseconds until the GPU 90 // the header bar will be visible for a few hundred milliseconds until the GPU
91 // process starts rendering again. To deal with this, the suspend is delayed 91 // process starts rendering again. To deal with this, the suspend is delayed
92 // until all the lock screen animations have completed and the suspend request 92 // until all the lock screen animations have completed and the suspend request
93 // is unblocked from OnLockAnimationsComplete(). 93 // is unblocked from OnLockAnimationsComplete().
94 if (!screen_locked_ && delegate->ShouldLockScreenAutomatically() && 94 if (!screen_locked_ && controller->ShouldLockScreenAutomatically() &&
95 delegate->CanLockScreen()) { 95 controller->CanLockScreen()) {
96 screen_lock_callback_ = chromeos::DBusThreadManager::Get() 96 screen_lock_callback_ = chromeos::DBusThreadManager::Get()
97 ->GetPowerManagerClient() 97 ->GetPowerManagerClient()
98 ->GetSuspendReadinessCallback(); 98 ->GetSuspendReadinessCallback();
99 VLOG(1) << "Requesting screen lock from PowerEventObserver"; 99 VLOG(1) << "Requesting screen lock from PowerEventObserver";
100 chromeos::DBusThreadManager::Get() 100 chromeos::DBusThreadManager::Get()
101 ->GetSessionManagerClient() 101 ->GetSessionManagerClient()
102 ->RequestLockScreen(); 102 ->RequestLockScreen();
103 } else if (waiting_for_lock_screen_animations_) { 103 } else if (waiting_for_lock_screen_animations_) {
104 // The lock-before-suspending pref has been set and the lock screen is ready 104 // The lock-before-suspending pref has been set and the lock screen is ready
105 // but the animations have not completed yet. This can happen if a suspend 105 // but the animations have not completed yet. This can happen if a suspend
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/system/chromeos/power/power_event_observer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698