Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: ash/accelerators/accelerator_controller.cc

Issue 10221028: Move DIP translation from ui/aura to ui/compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disable tests that doesn't run on bots Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/caps_lock_delegate.h" 9 #include "ash/caps_lock_delegate.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 case ROTATE_SCREEN: 506 case ROTATE_SCREEN:
507 return HandleRotateScreen(); 507 return HandleRotateScreen();
508 case TOGGLE_DESKTOP_BACKGROUND_MODE: 508 case TOGGLE_DESKTOP_BACKGROUND_MODE:
509 return HandleToggleDesktopBackgroundMode(); 509 return HandleToggleDesktopBackgroundMode();
510 case TOGGLE_ROOT_WINDOW_FULL_SCREEN: 510 case TOGGLE_ROOT_WINDOW_FULL_SCREEN:
511 return HandleToggleRootWindowFullScreen(); 511 return HandleToggleRootWindowFullScreen();
512 case PRINT_LAYER_HIERARCHY: 512 case PRINT_LAYER_HIERARCHY:
513 return HandlePrintLayerHierarchy(); 513 return HandlePrintLayerHierarchy();
514 case PRINT_WINDOW_HIERARCHY: 514 case PRINT_WINDOW_HIERARCHY:
515 return HandlePrintWindowHierarchy(); 515 return HandlePrintWindowHierarchy();
516 case ADD_REMOVE_MONITOR: 516 case MONITOR_ADD_REMOVE:
517 internal::MultiMonitorManager::AddRemoveMonitor(); 517 internal::MultiMonitorManager::AddRemoveMonitor();
518 return true; 518 return true;
519 case CYCLE_MONITOR: 519 case MONITOR_CYCLE:
520 internal::MultiMonitorManager::CycleMonitor(); 520 internal::MultiMonitorManager::CycleMonitor();
521 return true; 521 return true;
522 case MONITOR_TOGGLE_SCALE:
523 internal::MultiMonitorManager::ToggleMonitorScale();
524 return true;
522 #endif 525 #endif
523 default: 526 default:
524 NOTREACHED() << "Unhandled action " << it->second; 527 NOTREACHED() << "Unhandled action " << it->second;
525 } 528 }
526 return false; 529 return false;
527 } 530 }
528 531
529 void AcceleratorController::SwitchToWindow(int window) { 532 void AcceleratorController::SwitchToWindow(int window) {
530 const LauncherItems& items = 533 const LauncherItems& items =
531 Shell::GetInstance()->launcher()->model()->items(); 534 Shell::GetInstance()->launcher()->model()->items();
(...skipping 20 matching lines...) Expand all
552 // Then set this one as active. 555 // Then set this one as active.
553 ActivateLauncherItem(found_index); 556 ActivateLauncherItem(found_index);
554 } 557 }
555 } 558 }
556 559
557 bool AcceleratorController::CanHandleAccelerators() const { 560 bool AcceleratorController::CanHandleAccelerators() const {
558 return true; 561 return true;
559 } 562 }
560 563
561 } // namespace ash 564 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698