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

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

Issue 135563004: Nukes MessageLoop::Dispatcher (2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 11 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
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/session_state_delegate.h" 6 #include "ash/session_state_delegate.h"
7 #include "ash/shell.h" 7 #include "ash/shell.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"
(...skipping 10 matching lines...) Expand all
21 #if defined(USE_X11) 21 #if defined(USE_X11)
22 #include <X11/Xlib.h> 22 #include <X11/Xlib.h>
23 #include "ui/events/test/events_test_utils_x11.h" 23 #include "ui/events/test/events_test_utils_x11.h"
24 #endif // USE_X11 24 #endif // USE_X11
25 25
26 namespace ash { 26 namespace ash {
27 namespace test { 27 namespace test {
28 28
29 namespace { 29 namespace {
30 30
31 class MockDispatcher : public base::MessageLoop::Dispatcher { 31 class MockDispatcher : public base::MessagePumpDispatcher {
32 public: 32 public:
33 MockDispatcher() : num_key_events_dispatched_(0) { 33 MockDispatcher() : num_key_events_dispatched_(0) {
34 } 34 }
35 35
36 int num_key_events_dispatched() { return num_key_events_dispatched_; } 36 int num_key_events_dispatched() { return num_key_events_dispatched_; }
37 37
38 #if defined(OS_WIN) || defined(USE_X11) || defined(USE_OZONE) 38 #if defined(OS_WIN) || defined(USE_X11) || defined(USE_OZONE)
39 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE { 39 virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE {
40 if (ui::EventTypeFromNative(event) == ui::ET_KEY_RELEASED) 40 if (ui::EventTypeFromNative(event) == ui::ET_KEY_RELEASED)
41 num_key_events_dispatched_++; 41 num_key_events_dispatched_++;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher( 152 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
153 &inner_dispatcher, 153 &inner_dispatcher,
154 root_window, 154 root_window,
155 true /* nestable_tasks_allowed */); 155 true /* nestable_tasks_allowed */);
156 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched()); 156 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
157 EXPECT_EQ(1, target.accelerator_pressed_count()); 157 EXPECT_EQ(1, target.accelerator_pressed_count());
158 } 158 }
159 159
160 } // namespace test 160 } // namespace test
161 } // namespace ash 161 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698