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

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

Issue 10917075: events: Move some files into ui/base/events/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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 | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_dispatcher.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 #include "ash/accelerators/accelerator_table.h" 6 #include "ash/accelerators/accelerator_table.h"
7 #include "ash/caps_lock_delegate.h" 7 #include "ash/caps_lock_delegate.h"
8 #include "ash/ime_control_delegate.h" 8 #include "ash/ime_control_delegate.h"
9 #include "ash/screenshot_delegate.h" 9 #include "ash/screenshot_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/shell_window_ids.h" 11 #include "ash/shell_window_ids.h"
12 #include "ash/system/brightness/brightness_control_delegate.h" 12 #include "ash/system/brightness/brightness_control_delegate.h"
13 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h" 13 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
14 #include "ash/system/tray/system_tray_delegate.h" 14 #include "ash/system/tray/system_tray_delegate.h"
15 #include "ash/test/ash_test_base.h" 15 #include "ash/test/ash_test_base.h"
16 #include "ash/test/test_shell_delegate.h" 16 #include "ash/test/test_shell_delegate.h"
17 #include "ash/volume_control_delegate.h" 17 #include "ash/volume_control_delegate.h"
18 #include "ash/wm/window_util.h" 18 #include "ash/wm/window_util.h"
19 #include "ui/aura/root_window.h" 19 #include "ui/aura/root_window.h"
20 #include "ui/aura/test/test_window_delegate.h" 20 #include "ui/aura/test/test_window_delegate.h"
21 #include "ui/aura/test/test_windows.h" 21 #include "ui/aura/test/test_windows.h"
22 #include "ui/aura/window.h" 22 #include "ui/aura/window.h"
23 #include "ui/base/event.h" 23 #include "ui/base/events/event.h"
24 24
25 #if defined(USE_X11) 25 #if defined(USE_X11)
26 #include <X11/Xlib.h> 26 #include <X11/Xlib.h>
27 #include "ui/base/x/x11_util.h" 27 #include "ui/base/x/x11_util.h"
28 #endif 28 #endif
29 29
30 namespace ash { 30 namespace ash {
31 namespace test { 31 namespace test {
32 32
33 namespace { 33 namespace {
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 EXPECT_FALSE(GetController()->IsReservedAccelerator( 990 EXPECT_FALSE(GetController()->IsReservedAccelerator(
991 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE))); 991 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE)));
992 EXPECT_FALSE(GetController()->IsReservedAccelerator( 992 EXPECT_FALSE(GetController()->IsReservedAccelerator(
993 ui::Accelerator(ui::VKEY_TAB, ui::EF_NONE))); 993 ui::Accelerator(ui::VKEY_TAB, ui::EF_NONE)));
994 EXPECT_FALSE(GetController()->IsReservedAccelerator( 994 EXPECT_FALSE(GetController()->IsReservedAccelerator(
995 ui::Accelerator(ui::VKEY_A, ui::EF_NONE))); 995 ui::Accelerator(ui::VKEY_A, ui::EF_NONE)));
996 } 996 }
997 997
998 } // namespace test 998 } // namespace test
999 } // namespace ash 999 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698