| 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 813 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 824 } | 824 } |
| 825 case TOGGLE_FULLSCREEN: { | 825 case TOGGLE_FULLSCREEN: { |
| 826 if (key_code == ui::VKEY_MEDIA_LAUNCH_APP2) { | 826 if (key_code == ui::VKEY_MEDIA_LAUNCH_APP2) { |
| 827 shell->delegate()->RecordUserMetricsAction( | 827 shell->delegate()->RecordUserMetricsAction( |
| 828 UMA_ACCEL_FULLSCREEN_F4); | 828 UMA_ACCEL_FULLSCREEN_F4); |
| 829 } | 829 } |
| 830 shell->delegate()->ToggleFullscreen(); | 830 shell->delegate()->ToggleFullscreen(); |
| 831 return true; | 831 return true; |
| 832 } | 832 } |
| 833 case TOGGLE_MAXIMIZED: { | 833 case TOGGLE_MAXIMIZED: { |
| 834 if (key_code == ui::VKEY_MEDIA_LAUNCH_APP2) { | |
| 835 shell->delegate()->RecordUserMetricsAction( | |
| 836 UMA_ACCEL_MAXIMIZE_RESTORE_F4); | |
| 837 } | |
| 838 shell->delegate()->ToggleMaximized(); | 834 shell->delegate()->ToggleMaximized(); |
| 839 return true; | 835 return true; |
| 840 } | 836 } |
| 841 case WINDOW_POSITION_CENTER: { | 837 case WINDOW_POSITION_CENTER: { |
| 842 aura::Window* window = wm::GetActiveWindow(); | 838 aura::Window* window = wm::GetActiveWindow(); |
| 843 if (window) { | 839 if (window) { |
| 844 wm::CenterWindow(window); | 840 wm::CenterWindow(window); |
| 845 return true; | 841 return true; |
| 846 } | 842 } |
| 847 break; | 843 break; |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 967 keyboard_brightness_control_delegate) { | 963 keyboard_brightness_control_delegate) { |
| 968 keyboard_brightness_control_delegate_ = | 964 keyboard_brightness_control_delegate_ = |
| 969 keyboard_brightness_control_delegate.Pass(); | 965 keyboard_brightness_control_delegate.Pass(); |
| 970 } | 966 } |
| 971 | 967 |
| 972 bool AcceleratorController::CanHandleAccelerators() const { | 968 bool AcceleratorController::CanHandleAccelerators() const { |
| 973 return true; | 969 return true; |
| 974 } | 970 } |
| 975 | 971 |
| 976 } // namespace ash | 972 } // namespace ash |
| OLD | NEW |