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

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

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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_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) 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 <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 10
(...skipping 20 matching lines...) Expand all
31 #include "ash/system/tray/system_tray.h" 31 #include "ash/system/tray/system_tray.h"
32 #include "ash/system/tray/system_tray_delegate.h" 32 #include "ash/system/tray/system_tray_delegate.h"
33 #include "ash/volume_control_delegate.h" 33 #include "ash/volume_control_delegate.h"
34 #include "ash/wm/partial_screenshot_view.h" 34 #include "ash/wm/partial_screenshot_view.h"
35 #include "ash/wm/property_util.h" 35 #include "ash/wm/property_util.h"
36 #include "ash/wm/window_cycle_controller.h" 36 #include "ash/wm/window_cycle_controller.h"
37 #include "ash/wm/window_util.h" 37 #include "ash/wm/window_util.h"
38 #include "ash/wm/workspace/snap_sizer.h" 38 #include "ash/wm/workspace/snap_sizer.h"
39 #include "base/bind.h" 39 #include "base/bind.h"
40 #include "base/command_line.h" 40 #include "base/command_line.h"
41 #include "ui/aura/event.h"
42 #include "ui/aura/root_window.h" 41 #include "ui/aura/root_window.h"
43 #include "ui/base/accelerators/accelerator.h" 42 #include "ui/base/accelerators/accelerator.h"
44 #include "ui/base/accelerators/accelerator_manager.h" 43 #include "ui/base/accelerators/accelerator_manager.h"
44 #include "ui/base/event.h"
45 #include "ui/base/keycodes/keyboard_codes.h" 45 #include "ui/base/keycodes/keyboard_codes.h"
46 #include "ui/compositor/debug_utils.h" 46 #include "ui/compositor/debug_utils.h"
47 #include "ui/compositor/layer.h" 47 #include "ui/compositor/layer.h"
48 #include "ui/compositor/layer_animation_sequence.h" 48 #include "ui/compositor/layer_animation_sequence.h"
49 #include "ui/compositor/layer_animator.h" 49 #include "ui/compositor/layer_animator.h"
50 #include "ui/oak/oak.h" 50 #include "ui/oak/oak.h"
51 #include "ui/views/debug_utils.h" 51 #include "ui/views/debug_utils.h"
52 #include "ui/views/widget/widget.h" 52 #include "ui/views/widget/widget.h"
53 53
54 #if defined(OS_CHROMEOS) 54 #if defined(OS_CHROMEOS)
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 accelerators_.insert( 746 accelerators_.insert(
747 std::make_pair(accelerator, accelerators[i].action)); 747 std::make_pair(accelerator, accelerators[i].action));
748 } 748 }
749 } 749 }
750 750
751 bool AcceleratorController::CanHandleAccelerators() const { 751 bool AcceleratorController::CanHandleAccelerators() const {
752 return true; 752 return true;
753 } 753 }
754 754
755 } // namespace ash 755 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698