OLD | NEW |
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/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <iostream> | 9 #include <iostream> |
10 #include <string> | 10 #include <string> |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 | 88 |
89 bool HandleCycleWindowMRU(WindowCycleController::Direction direction, | 89 bool HandleCycleWindowMRU(WindowCycleController::Direction direction, |
90 bool is_alt_down) { | 90 bool is_alt_down) { |
91 Shell::GetInstance()-> | 91 Shell::GetInstance()-> |
92 window_cycle_controller()->HandleCycleWindow(direction, is_alt_down); | 92 window_cycle_controller()->HandleCycleWindow(direction, is_alt_down); |
93 // Always report we handled the key, even if the window didn't change. | 93 // Always report we handled the key, even if the window didn't change. |
94 return true; | 94 return true; |
95 } | 95 } |
96 | 96 |
97 void HandleCycleWindowLinear(CycleDirection direction) { | 97 void HandleCycleWindowLinear(CycleDirection direction) { |
98 Launcher::ForPrimaryDisplay()->CycleWindowLinear(direction); | 98 Shell::GetInstance()-> |
| 99 window_cycle_controller()->HandleLinearCycleWindow(); |
99 } | 100 } |
100 | 101 |
101 #if defined(OS_CHROMEOS) | 102 #if defined(OS_CHROMEOS) |
102 bool HandleLock() { | 103 bool HandleLock() { |
103 Shell::GetInstance()->delegate()->LockScreen(); | 104 Shell::GetInstance()->delegate()->LockScreen(); |
104 return true; | 105 return true; |
105 } | 106 } |
106 | 107 |
107 bool HandleFileManager(bool as_dialog) { | 108 bool HandleFileManager(bool as_dialog) { |
108 Shell::GetInstance()->delegate()->OpenFileManager(as_dialog); | 109 Shell::GetInstance()->delegate()->OpenFileManager(as_dialog); |
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
897 keyboard_brightness_control_delegate) { | 898 keyboard_brightness_control_delegate) { |
898 keyboard_brightness_control_delegate_ = | 899 keyboard_brightness_control_delegate_ = |
899 keyboard_brightness_control_delegate.Pass(); | 900 keyboard_brightness_control_delegate.Pass(); |
900 } | 901 } |
901 | 902 |
902 bool AcceleratorController::CanHandleAccelerators() const { | 903 bool AcceleratorController::CanHandleAccelerators() const { |
903 return true; | 904 return true; |
904 } | 905 } |
905 | 906 |
906 } // namespace ash | 907 } // namespace ash |
OLD | NEW |