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

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

Issue 222383002: Move UserActivityDetector from ash/wm/ to ui/wm/core/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove an unneeded include 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"
11 #include "ash/wm/user_activity_detector.h"
12 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
13 #include "chromeos/dbus/dbus_thread_manager.h" 12 #include "chromeos/dbus/dbus_thread_manager.h"
14 #include "ui/display/chromeos/output_configurator.h" 13 #include "ui/display/chromeos/output_configurator.h"
14 #include "ui/wm/core/user_activity_detector.h"
15 15
16 namespace ash { 16 namespace ash {
17 namespace internal { 17 namespace internal {
18 18
19 PowerEventObserver::PowerEventObserver() 19 PowerEventObserver::PowerEventObserver()
20 : screen_locked_(false) { 20 : screen_locked_(false) {
21 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> 21 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
22 AddObserver(this); 22 AddObserver(this);
23 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 23 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
24 AddObserver(this); 24 AddObserver(this);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 VLOG(1) << "Screen locked without suspend"; 75 VLOG(1) << "Screen locked without suspend";
76 } 76 }
77 } 77 }
78 78
79 void PowerEventObserver::ScreenIsUnlocked() { 79 void PowerEventObserver::ScreenIsUnlocked() {
80 screen_locked_ = false; 80 screen_locked_ = false;
81 } 81 }
82 82
83 } // namespace internal 83 } // namespace internal
84 } // namespace ash 84 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698