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

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

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS 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 | « WATCHLISTS ('k') | ash/app_list/app_list.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/desktop_background/desktop_background_controller.h"
9 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
10 #include "ash/caps_lock_delegate.h" 9 #include "ash/caps_lock_delegate.h"
10 #include "ash/desktop_background/desktop_background_controller.h"
11 #include "ash/focus_cycler.h" 11 #include "ash/focus_cycler.h"
12 #include "ash/ime_control_delegate.h" 12 #include "ash/ime_control_delegate.h"
13 #include "ash/launcher/launcher.h" 13 #include "ash/launcher/launcher.h"
14 #include "ash/launcher/launcher_delegate.h"
14 #include "ash/launcher/launcher_model.h" 15 #include "ash/launcher/launcher_model.h"
15 #include "ash/launcher/launcher_delegate.h"
16 #include "ash/monitor/multi_monitor_manager.h" 16 #include "ash/monitor/multi_monitor_manager.h"
17 #include "ash/screenshot_delegate.h" 17 #include "ash/screenshot_delegate.h"
18 #include "ash/shell.h" 18 #include "ash/shell.h"
19 #include "ash/shell_delegate.h" 19 #include "ash/shell_delegate.h"
20 #include "ash/shell_window_ids.h" 20 #include "ash/shell_window_ids.h"
21 #include "ash/system/brightness/brightness_control_delegate.h" 21 #include "ash/system/brightness/brightness_control_delegate.h"
22 #include "ash/system/tray/system_tray.h" 22 #include "ash/system/tray/system_tray.h"
23 #include "ash/volume_control_delegate.h" 23 #include "ash/volume_control_delegate.h"
24 #include "ash/wm/property_util.h" 24 #include "ash/wm/property_util.h"
25 #include "ash/wm/window_cycle_controller.h" 25 #include "ash/wm/window_cycle_controller.h"
26 #include "ash/wm/window_util.h" 26 #include "ash/wm/window_util.h"
27 #include "ash/wm/workspace/snap_sizer.h" 27 #include "ash/wm/workspace/snap_sizer.h"
28 #include "base/command_line.h" 28 #include "base/command_line.h"
29 #include "ui/aura/event.h" 29 #include "ui/aura/event.h"
30 #include "ui/aura/root_window.h" 30 #include "ui/aura/root_window.h"
31 #include "ui/base/accelerators/accelerator.h" 31 #include "ui/base/accelerators/accelerator.h"
32 #include "ui/base/accelerators/accelerator_manager.h" 32 #include "ui/base/accelerators/accelerator_manager.h"
33 #include "ui/gfx/compositor/debug_utils.h" 33 #include "ui/compositor/debug_utils.h"
34 #include "ui/gfx/compositor/layer.h" 34 #include "ui/compositor/layer.h"
35 #include "ui/gfx/compositor/layer_animation_sequence.h" 35 #include "ui/compositor/layer_animation_sequence.h"
36 #include "ui/gfx/compositor/layer_animator.h" 36 #include "ui/compositor/layer_animator.h"
37 #include "ui/gfx/compositor/screen_rotation.h" 37 #include "ui/compositor/screen_rotation.h"
38 #include "ui/oak/oak.h" 38 #include "ui/oak/oak.h"
39 39
40 namespace { 40 namespace {
41 41
42 bool HandleCycleWindowMRU(ash::WindowCycleController::Direction direction, 42 bool HandleCycleWindowMRU(ash::WindowCycleController::Direction direction,
43 bool is_alt_down) { 43 bool is_alt_down) {
44 // TODO(mukai): support Apps windows here. 44 // TODO(mukai): support Apps windows here.
45 ash::Shell::GetInstance()-> 45 ash::Shell::GetInstance()->
46 window_cycle_controller()->HandleCycleWindow(direction, is_alt_down); 46 window_cycle_controller()->HandleCycleWindow(direction, is_alt_down);
47 // Always report we handled the key, even if the window didn't change. 47 // Always report we handled the key, even if the window didn't change.
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 // Then set this one as active. 551 // Then set this one as active.
552 ActivateLauncherItem(found_index); 552 ActivateLauncherItem(found_index);
553 } 553 }
554 } 554 }
555 555
556 bool AcceleratorController::CanHandleAccelerators() const { 556 bool AcceleratorController::CanHandleAccelerators() const {
557 return true; 557 return true;
558 } 558 }
559 559
560 } // namespace ash 560 } // namespace ash
OLDNEW
« no previous file with comments | « WATCHLISTS ('k') | ash/app_list/app_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698