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

Side by Side Diff: ash/accelerators/nested_dispatcher_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_table.h ('k') | ash/display/mouse_cursor_event_filter.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/shell.h" 6 #include "ash/shell.h"
7 #include "ash/shell_delegate.h" 7 #include "ash/shell_delegate.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/event_types.h" 11 #include "base/event_types.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "ui/aura/client/dispatcher_client.h" 13 #include "ui/aura/client/dispatcher_client.h"
14 #include "ui/aura/root_window.h" 14 #include "ui/aura/root_window.h"
15 #include "ui/aura/test/test_windows.h" 15 #include "ui/aura/test/test_windows.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/base/accelerators/accelerator.h" 17 #include "ui/base/accelerators/accelerator.h"
18 #include "ui/base/events.h" 18 #include "ui/base/events/event_constants.h"
19 19
20 #if defined(USE_X11) 20 #if defined(USE_X11)
21 #include <X11/Xlib.h> 21 #include <X11/Xlib.h>
22 #include "ui/base/x/x11_util.h" 22 #include "ui/base/x/x11_util.h"
23 #endif // USE_X11 23 #endif // USE_X11
24 24
25 namespace ash { 25 namespace ash {
26 namespace test { 26 namespace test {
27 27
28 namespace { 28 namespace {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher( 156 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
157 &inner_dispatcher, 157 &inner_dispatcher,
158 root_window, 158 root_window,
159 true /* nestable_tasks_allowed */); 159 true /* nestable_tasks_allowed */);
160 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched()); 160 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
161 EXPECT_EQ(1, target.accelerator_pressed_count()); 161 EXPECT_EQ(1, target.accelerator_pressed_count());
162 } 162 }
163 163
164 } // namespace test 164 } // namespace test
165 } // namespace ash 165 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/display/mouse_cursor_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698