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

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

Issue 11275139: Move ui\aura\shared to ui\views\corewm (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « ash/shell.cc ('k') | ash/wm/session_state_controller.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/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_delegate.h" 9 #include "ash/shell_delegate.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
11 #include "ash/wm/session_state_animator.h" 11 #include "ash/wm/session_state_animator.h"
12 #include "ash/wm/session_state_controller.h" 12 #include "ash/wm/session_state_controller.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "ui/aura/root_window.h" 14 #include "ui/aura/root_window.h"
15 #include "ui/aura/shared/compound_event_filter.h" 15 #include "ui/views/corewm/compound_event_filter.h"
16 16
17 namespace ash { 17 namespace ash {
18 18
19 PowerButtonController::PowerButtonController(SessionStateController* controller) 19 PowerButtonController::PowerButtonController(SessionStateController* controller)
20 : power_button_down_(false), 20 : power_button_down_(false),
21 lock_button_down_(false), 21 lock_button_down_(false),
22 screen_is_off_(false), 22 screen_is_off_(false),
23 has_legacy_power_button_( 23 has_legacy_power_button_(
24 CommandLine::ForCurrentProcess()->HasSwitch( 24 CommandLine::ForCurrentProcess()->HasSwitch(
25 switches::kAuraLegacyPowerButton)), 25 switches::kAuraLegacyPowerButton)),
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 if (controller_->IsLocked() || controller_->LockRequested()) 91 if (controller_->IsLocked() || controller_->LockRequested())
92 return; 92 return;
93 93
94 if (down) 94 if (down)
95 controller_->StartLockAnimation(false); 95 controller_->StartLockAnimation(false);
96 else 96 else
97 controller_->CancelLockAnimation(); 97 controller_->CancelLockAnimation();
98 } 98 }
99 99
100 } // namespace ash 100 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/wm/session_state_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698