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

Unified Diff: ui/views/widget/native_widget_aura_unittest.cc

Issue 191153004: Provide access to the WindowEventDispatcher as a ui::EventProcessor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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
« no previous file with comments | « ui/views/test/views_test_base.cc ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_aura_unittest.cc
diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc
index e4c6670df282eb7b181f75592330ad3acea4fd6c..0947bda9795481bfd9b6a889c0a6419e1991993b 100644
--- a/ui/views/widget/native_widget_aura_unittest.cc
+++ b/ui/views/widget/native_widget_aura_unittest.cc
@@ -40,14 +40,11 @@ class NativeWidgetAuraTest : public ViewsTestBase {
// testing::Test overrides:
virtual void SetUp() OVERRIDE {
ViewsTestBase::SetUp();
- dispatcher()->host()->SetBounds(gfx::Rect(640, 480));
+ host()->SetBounds(gfx::Rect(640, 480));
}
protected:
aura::Window* root_window() { return GetContext(); }
- aura::WindowEventDispatcher* dispatcher() {
- return root_window()->GetHost()->dispatcher();
- }
private:
DISALLOW_COPY_AND_ASSIGN(NativeWidgetAuraTest);
@@ -253,7 +250,8 @@ TEST_F(NativeWidgetAuraTest, DontCaptureOnGesture) {
ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(41, 51), 1,
base::TimeDelta());
- ui::EventDispatchDetails details = dispatcher()->OnEventFromSource(&press);
+ ui::EventDispatchDetails details =
+ event_processor()->OnEventFromSource(&press);
ASSERT_FALSE(details.dispatcher_destroyed);
// Both views should get the press.
EXPECT_TRUE(view->got_gesture_event());
@@ -267,7 +265,7 @@ TEST_F(NativeWidgetAuraTest, DontCaptureOnGesture) {
// the press.
ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(250, 251), 1,
base::TimeDelta());
- details = dispatcher()->OnEventFromSource(&release);
+ details = event_processor()->OnEventFromSource(&release);
ASSERT_FALSE(details.dispatcher_destroyed);
EXPECT_TRUE(view->got_gesture_event());
EXPECT_FALSE(child->got_gesture_event());
« no previous file with comments | « ui/views/test/views_test_base.cc ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698