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

Side by Side Diff: ash/wm/power_button_controller.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: 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/wm/panels/panel_window_resizer_unittest.cc ('k') | ash/wm/resize_handle_window_targeter.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/wm/power_button_controller.h" 5 #include "ash/wm/power_button_controller.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/ash_switches.h" 8 #include "ash/common/ash_switches.h"
9 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/common/wm_shell.h"
9 #include "ash/public/cpp/shell_window_ids.h" 11 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/session/session_state_delegate.h"
11 #include "ash/shell.h" 12 #include "ash/shell.h"
12 #include "ash/system/audio/tray_audio.h" 13 #include "ash/system/audio/tray_audio.h"
13 #include "ash/system/power/tablet_power_button_controller.h" 14 #include "ash/system/power/tablet_power_button_controller.h"
14 #include "ash/system/tray/system_tray.h" 15 #include "ash/system/tray/system_tray.h"
15 #include "ash/wm/lock_state_controller.h" 16 #include "ash/wm/lock_state_controller.h"
16 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 17 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
17 #include "ash/wm/session_state_animator.h" 18 #include "ash/wm/session_state_animator.h"
18 #include "ash/wm_shell.h"
19 #include "base/command_line.h" 19 #include "base/command_line.h"
20 #include "chromeos/audio/cras_audio_handler.h" 20 #include "chromeos/audio/cras_audio_handler.h"
21 #include "chromeos/dbus/dbus_thread_manager.h" 21 #include "chromeos/dbus/dbus_thread_manager.h"
22 #include "ui/aura/window_event_dispatcher.h" 22 #include "ui/aura/window_event_dispatcher.h"
23 #include "ui/display/types/display_snapshot.h" 23 #include "ui/display/types/display_snapshot.h"
24 #include "ui/wm/core/compound_event_filter.h" 24 #include "ui/wm/core/compound_event_filter.h"
25 25
26 namespace ash { 26 namespace ash {
27 27
28 PowerButtonController::PowerButtonController(LockStateController* controller) 28 PowerButtonController::PowerButtonController(LockStateController* controller)
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 internal_display_off && external_display_on; 191 internal_display_off && external_display_on;
192 } 192 }
193 193
194 void PowerButtonController::PowerButtonEventReceived( 194 void PowerButtonController::PowerButtonEventReceived(
195 bool down, 195 bool down,
196 const base::TimeTicks& timestamp) { 196 const base::TimeTicks& timestamp) {
197 OnPowerButtonEvent(down, timestamp); 197 OnPowerButtonEvent(down, timestamp);
198 } 198 }
199 199
200 } // namespace ash 200 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | ash/wm/resize_handle_window_targeter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698