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

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

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include Created 4 years, 5 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/shell.cc ('k') | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.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/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_state_delegate.h" 9 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/common/shell_window_ids.h" 10 #include "ash/common/shell_window_ids.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // Avoid starting the lock/shutdown sequence if the power button is pressed 73 // Avoid starting the lock/shutdown sequence if the power button is pressed
74 // while the screen is off (http://crbug.com/128451), unless an external 74 // while the screen is off (http://crbug.com/128451), unless an external
75 // display is still on (http://crosbug.com/p/24912). 75 // display is still on (http://crosbug.com/p/24912).
76 if (brightness_is_zero_ && !internal_display_off_and_external_display_on_) 76 if (brightness_is_zero_ && !internal_display_off_and_external_display_on_)
77 return; 77 return;
78 78
79 if (volume_down_pressed_ && down && 79 if (volume_down_pressed_ && down &&
80 WmShell::Get() 80 WmShell::Get()
81 ->maximize_mode_controller() 81 ->maximize_mode_controller()
82 ->IsMaximizeModeWindowManagerEnabled()) { 82 ->IsMaximizeModeWindowManagerEnabled()) {
83 Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled( 83 WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(
84 TAKE_SCREENSHOT); 84 TAKE_SCREENSHOT);
85 return; 85 return;
86 } 86 }
87 87
88 const SessionStateDelegate* session_state_delegate = 88 const SessionStateDelegate* session_state_delegate =
89 WmShell::Get()->GetSessionStateDelegate(); 89 WmShell::Get()->GetSessionStateDelegate();
90 if (has_legacy_power_button_) { 90 if (has_legacy_power_button_) {
91 // If power button releases won't get reported correctly because we're not 91 // If power button releases won't get reported correctly because we're not
92 // running on official hardware, just lock the screen or shut down 92 // running on official hardware, just lock the screen or shut down
93 // immediately. 93 // immediately.
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 } 173 }
174 174
175 void PowerButtonController::PowerButtonEventReceived( 175 void PowerButtonController::PowerButtonEventReceived(
176 bool down, 176 bool down,
177 const base::TimeTicks& timestamp) { 177 const base::TimeTicks& timestamp) {
178 OnPowerButtonEvent(down, timestamp); 178 OnPowerButtonEvent(down, timestamp);
179 } 179 }
180 #endif // defined(OS_CHROMEOS) 180 #endif // defined(OS_CHROMEOS)
181 181
182 } // namespace ash 182 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698