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

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

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/system/DEPS ('k') | base/prefs/DEPS » ('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/session/session_state_delegate.h" 7 #include "ash/session/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 "base/prefs/pref_service.h"
11 #include "chromeos/dbus/dbus_thread_manager.h" 12 #include "chromeos/dbus/dbus_thread_manager.h"
12 #include "components/prefs/pref_service.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/chromeos/display_configurator.h" 17 #include "ui/display/chromeos/display_configurator.h"
18 18
19 namespace ash { 19 namespace ash {
20 20
21 namespace { 21 namespace {
22 22
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 } else { 148 } else {
149 VLOG(1) << "Screen locked without suspend"; 149 VLOG(1) << "Screen locked without suspend";
150 } 150 }
151 } 151 }
152 152
153 void PowerEventObserver::ScreenIsUnlocked() { 153 void PowerEventObserver::ScreenIsUnlocked() {
154 screen_locked_ = false; 154 screen_locked_ = false;
155 } 155 }
156 156
157 } // namespace ash 157 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/DEPS ('k') | base/prefs/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698