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 <string> | 9 #include <string> |
10 | 10 |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 return HandleLock(); | 400 return HandleLock(); |
401 case OPEN_FILE_MANAGER_DIALOG: | 401 case OPEN_FILE_MANAGER_DIALOG: |
402 return HandleFileManager(true /* as_dialog */); | 402 return HandleFileManager(true /* as_dialog */); |
403 case OPEN_FILE_MANAGER_TAB: | 403 case OPEN_FILE_MANAGER_TAB: |
404 return HandleFileManager(false /* as_dialog */); | 404 return HandleFileManager(false /* as_dialog */); |
405 case OPEN_CROSH: | 405 case OPEN_CROSH: |
406 return HandleCrosh(); | 406 return HandleCrosh(); |
407 case TOGGLE_SPOKEN_FEEDBACK: | 407 case TOGGLE_SPOKEN_FEEDBACK: |
408 return HandleToggleSpokenFeedback(); | 408 return HandleToggleSpokenFeedback(); |
409 case CYCLE_DISPLAY_MODE: | 409 case CYCLE_DISPLAY_MODE: |
410 ash::Shell::GetInstance()->output_configurator()->CycleDisplayMode( | 410 ash::Shell::GetInstance()->output_configurator()->CycleDisplayMode(); |
411 internal::DisplayController::IsExtendedDesktopEnabled()); | |
412 return true; | 411 return true; |
413 #endif | 412 #endif |
414 case OPEN_FEEDBACK_PAGE: | 413 case OPEN_FEEDBACK_PAGE: |
415 ash::Shell::GetInstance()->delegate()->OpenFeedbackPage(); | 414 ash::Shell::GetInstance()->delegate()->OpenFeedbackPage(); |
416 return true; | 415 return true; |
417 case EXIT: | 416 case EXIT: |
418 return HandleExit(); | 417 return HandleExit(); |
419 case NEW_INCOGNITO_WINDOW: | 418 case NEW_INCOGNITO_WINDOW: |
420 return HandleNewWindow(true /* is_incognito */); | 419 return HandleNewWindow(true /* is_incognito */); |
421 case NEW_TAB: | 420 case NEW_TAB: |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
735 accelerators_.insert( | 734 accelerators_.insert( |
736 std::make_pair(accelerator, accelerators[i].action)); | 735 std::make_pair(accelerator, accelerators[i].action)); |
737 } | 736 } |
738 } | 737 } |
739 | 738 |
740 bool AcceleratorController::CanHandleAccelerators() const { | 739 bool AcceleratorController::CanHandleAccelerators() const { |
741 return true; | 740 return true; |
742 } | 741 } |
743 | 742 |
744 } // namespace ash | 743 } // namespace ash |
OLD | NEW |