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

Unified Diff: ash/accelerators/nested_dispatcher_controller_unittest.cc

Issue 280483003: wm: Change the DispatcherClient interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-tests Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: ash/accelerators/nested_dispatcher_controller_unittest.cc
diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc
index e5aef887fb50c9d65fa0f8c0c26a40b1cbe1dd80..399cbcbd4ec6bc8dc9029e69148b0fc8c3702e26 100644
--- a/ash/accelerators/nested_dispatcher_controller_unittest.cc
+++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc
@@ -123,7 +123,9 @@ TEST_F(NestedDispatcherTest, AssociatedWindowAboveLockScreen) {
scoped_ptr<ui::ScopedEventDispatcher> override_dispatcher =
ui::PlatformEventSource::GetInstance()->OverrideDispatcher(
&inner_dispatcher);
- aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(NULL);
+ base::Closure quit_runloop;
+ aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
+ NULL, &quit_runloop);
EXPECT_EQ(1, inner_dispatcher.num_key_events_dispatched());
}
@@ -142,7 +144,9 @@ TEST_F(NestedDispatcherTest, AcceleratorsHandled) {
scoped_ptr<ui::ScopedEventDispatcher> override_dispatcher =
ui::PlatformEventSource::GetInstance()->OverrideDispatcher(
&inner_dispatcher);
- aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(NULL);
+ base::Closure quit_runloop;
+ aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
+ NULL, &quit_runloop);
EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
EXPECT_EQ(1, target.accelerator_pressed_count());
}

Powered by Google App Engine
This is Rietveld 408576698