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

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

Issue 2766543002: Move even more from WmShell to Shell (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
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/common/accelerators/accelerator_controller.h" 7 #include "ash/common/accelerators/accelerator_controller.h"
8 #include "ash/common/ash_switches.h" 8 #include "ash/common/ash_switches.h"
9 #include "ash/common/session/session_controller.h" 9 #include "ash/common/session/session_controller.h"
10 #include "ash/common/system/chromeos/audio/tray_audio.h" 10 #include "ash/common/system/chromeos/audio/tray_audio.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 void PowerButtonController::OnPowerButtonEvent( 62 void PowerButtonController::OnPowerButtonEvent(
63 bool down, 63 bool down,
64 const base::TimeTicks& timestamp) { 64 const base::TimeTicks& timestamp) {
65 power_button_down_ = down; 65 power_button_down_ = down;
66 66
67 if (lock_state_controller_->ShutdownRequested()) 67 if (lock_state_controller_->ShutdownRequested())
68 return; 68 return;
69 69
70 bool should_take_screenshot = down && volume_down_pressed_ && 70 bool should_take_screenshot = down && volume_down_pressed_ &&
71 WmShell::Get() 71 Shell::Get()
72 ->maximize_mode_controller() 72 ->maximize_mode_controller()
73 ->IsMaximizeModeWindowManagerEnabled(); 73 ->IsMaximizeModeWindowManagerEnabled();
74 74
75 if (!has_legacy_power_button_ && !should_take_screenshot && 75 if (!has_legacy_power_button_ && !should_take_screenshot &&
76 tablet_controller_ && 76 tablet_controller_ &&
77 tablet_controller_->ShouldHandlePowerButtonEvents()) { 77 tablet_controller_->ShouldHandlePowerButtonEvents()) {
78 tablet_controller_->OnPowerButtonEvent(down, timestamp); 78 tablet_controller_->OnPowerButtonEvent(down, timestamp);
79 return; 79 return;
80 } 80 }
81 81
(...skipping 109 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_layout_manager_unittest.cc ('k') | chrome/browser/chromeos/display/display_preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698