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 "ash/accelerators/accelerator_table.h" | 7 #include "ash/accelerators/accelerator_table.h" |
8 #include "ash/desktop_background/desktop_background_controller.h" | 8 #include "ash/desktop_background/desktop_background_controller.h" |
9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
10 #include "ash/caps_lock_delegate.h" | 10 #include "ash/caps_lock_delegate.h" |
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
505 case ROTATE_SCREEN: | 505 case ROTATE_SCREEN: |
506 return HandleRotateScreen(); | 506 return HandleRotateScreen(); |
507 case TOGGLE_DESKTOP_BACKGROUND_MODE: | 507 case TOGGLE_DESKTOP_BACKGROUND_MODE: |
508 return HandleToggleDesktopBackgroundMode(); | 508 return HandleToggleDesktopBackgroundMode(); |
509 case TOGGLE_ROOT_WINDOW_FULL_SCREEN: | 509 case TOGGLE_ROOT_WINDOW_FULL_SCREEN: |
510 return HandleToggleRootWindowFullScreen(); | 510 return HandleToggleRootWindowFullScreen(); |
511 case PRINT_LAYER_HIERARCHY: | 511 case PRINT_LAYER_HIERARCHY: |
512 return HandlePrintLayerHierarchy(); | 512 return HandlePrintLayerHierarchy(); |
513 case PRINT_WINDOW_HIERARCHY: | 513 case PRINT_WINDOW_HIERARCHY: |
514 return HandlePrintWindowHierarchy(); | 514 return HandlePrintWindowHierarchy(); |
515 case ADD_REMOVE_MONITOR: | 515 case MONITOR_ADD_REMOVE: |
516 internal::MultiMonitorManager::AddRemoveMonitor(); | 516 internal::MultiMonitorManager::AddRemoveMonitor(); |
517 return true; | 517 return true; |
518 case CYCLE_MONITOR: | 518 case MONITOR_CYCLE: |
519 internal::MultiMonitorManager::CycleMonitor(); | 519 internal::MultiMonitorManager::CycleMonitor(); |
520 return true; | 520 return true; |
| 521 case MONITOR_SCALE: |
| 522 internal::MultiMonitorManager::ScaleMonitor(); |
| 523 return true; |
521 #endif | 524 #endif |
522 default: | 525 default: |
523 NOTREACHED() << "Unhandled action " << it->second; | 526 NOTREACHED() << "Unhandled action " << it->second; |
524 } | 527 } |
525 return false; | 528 return false; |
526 } | 529 } |
527 | 530 |
528 void AcceleratorController::SwitchToWindow(int window) { | 531 void AcceleratorController::SwitchToWindow(int window) { |
529 const LauncherItems& items = | 532 const LauncherItems& items = |
530 Shell::GetInstance()->launcher()->model()->items(); | 533 Shell::GetInstance()->launcher()->model()->items(); |
(...skipping 20 matching lines...) Expand all Loading... |
551 // Then set this one as active. | 554 // Then set this one as active. |
552 ActivateLauncherItem(found_index); | 555 ActivateLauncherItem(found_index); |
553 } | 556 } |
554 } | 557 } |
555 | 558 |
556 bool AcceleratorController::CanHandleAccelerators() const { | 559 bool AcceleratorController::CanHandleAccelerators() const { |
557 return true; | 560 return true; |
558 } | 561 } |
559 | 562 |
560 } // namespace ash | 563 } // namespace ash |
OLD | NEW |