diff options
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 29380da..287bcec 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -16,8 +16,8 @@ #include "ash/launcher/launcher_delegate.h" #include "ash/launcher/launcher_model.h" #include "ash/magnifier/magnification_controller.h" -#include "ash/display/display_controller.h" -#include "ash/display/multi_display_manager.h" +#include "ash/monitor/monitor_controller.h" +#include "ash/monitor/multi_monitor_manager.h" #include "ash/root_window_controller.h" #include "ash/screenshot_delegate.h" #include "ash/shell.h" @@ -44,7 +44,7 @@ #include "ui/oak/oak.h" #if defined(OS_CHROMEOS) -#include "chromeos/display/output_configurator.h" +#include "chromeos/monitor/output_configurator.h" #endif // defined(OS_CHROMEOS) namespace ash { @@ -585,17 +585,17 @@ bool AcceleratorController::PerformAction(int action, return HandleToggleDesktopBackgroundMode(); case TOGGLE_ROOT_WINDOW_FULL_SCREEN: return HandleToggleRootWindowFullScreen(); - case DISPLAY_ADD_REMOVE: + case MONITOR_ADD_REMOVE: if (DebugShortcutsEnabled()) - internal::MultiDisplayManager::AddRemoveDisplay(); + internal::MultiMonitorManager::AddRemoveMonitor(); return true; - case DISPLAY_CYCLE: + case MONITOR_CYCLE: if (DebugShortcutsEnabled()) - internal::MultiDisplayManager::CycleDisplay(); + internal::MultiMonitorManager::CycleMonitor(); return true; - case DISPLAY_TOGGLE_SCALE: + case MONITOR_TOGGLE_SCALE: if (DebugShortcutsEnabled()) - internal::MultiDisplayManager::ToggleDisplayScale(); + internal::MultiMonitorManager::ToggleMonitorScale(); return true; case MAGNIFY_SCREEN_ZOOM_IN: return HandleMagnifyScreen(1); |