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

Side by Side Diff: ui/aura_shell/shell_accelerator_controller.cc

Issue 9035001: Move some more WM functionality down into ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 | « ui/aura_shell/shell.cc ('k') | ui/aura_shell/shell_accelerator_controller_unittest.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/aura_shell/shell_accelerator_controller.h" 5 #include "ui/aura_shell/shell_accelerator_controller.h"
6 6
7 #include "ash/wm/window_util.h"
7 #include "ui/aura/event.h" 8 #include "ui/aura/event.h"
8 #include "ui/aura/root_window.h" 9 #include "ui/aura/root_window.h"
9 #include "ui/aura_shell/launcher/launcher.h" 10 #include "ui/aura_shell/launcher/launcher.h"
10 #include "ui/aura_shell/launcher/launcher_model.h" 11 #include "ui/aura_shell/launcher/launcher_model.h"
11 #include "ui/aura_shell/screenshot_delegate.h" 12 #include "ui/aura_shell/screenshot_delegate.h"
12 #include "ui/aura_shell/shell.h" 13 #include "ui/aura_shell/shell.h"
13 #include "ui/aura_shell/shell_window_ids.h" 14 #include "ui/aura_shell/shell_window_ids.h"
14 #include "ui/aura_shell/window_util.h"
15 #include "ui/base/accelerators/accelerator.h" 15 #include "ui/base/accelerators/accelerator.h"
16 #include "ui/base/accelerators/accelerator_manager.h" 16 #include "ui/base/accelerators/accelerator_manager.h"
17 #include "ui/gfx/compositor/debug_utils.h" 17 #include "ui/gfx/compositor/debug_utils.h"
18 #include "ui/gfx/compositor/layer_animation_sequence.h" 18 #include "ui/gfx/compositor/layer_animation_sequence.h"
19 #include "ui/gfx/compositor/layer_animator.h" 19 #include "ui/gfx/compositor/layer_animator.h"
20 #include "ui/gfx/compositor/screen_rotation.h" 20 #include "ui/gfx/compositor/screen_rotation.h"
21 21
22 namespace { 22 namespace {
23 23
24 enum AcceleratorAction { 24 enum AcceleratorAction {
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 case PRINT_LAYER_HIERARCHY: 197 case PRINT_LAYER_HIERARCHY:
198 return HandlePrintLayerHierarchy(); 198 return HandlePrintLayerHierarchy();
199 #endif 199 #endif
200 default: 200 default:
201 NOTREACHED() << "Unhandled action " << it->second;; 201 NOTREACHED() << "Unhandled action " << it->second;;
202 } 202 }
203 return false; 203 return false;
204 } 204 }
205 205
206 } // namespace aura_shell 206 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura_shell/shell.cc ('k') | ui/aura_shell/shell_accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698