| OLD | NEW |
| 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/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/system_tray_notifier.h" | |
| 9 #include "ash/common/wm_shell.h" | 8 #include "ash/common/wm_shell.h" |
| 10 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/system/tray/system_tray_notifier.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" |
| 18 | 18 |
| 19 namespace ash { | 19 namespace ash { |
| 20 | 20 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |