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

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

Issue 77203002: Revert 236048 "Rename RootWindowHost* to WindowTreeHost*" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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 | « trunk/src/ui/views/widget/native_widget_aura.cc ('k') | trunk/src/ui/views/widget/widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/widget/native_widget_aura_unittest.cc
===================================================================
--- trunk/src/ui/views/widget/native_widget_aura_unittest.cc (revision 236092)
+++ trunk/src/ui/views/widget/native_widget_aura_unittest.cc (working copy)
@@ -258,7 +258,7 @@
ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(41, 51), 1,
base::TimeDelta());
- dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);
+ dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
// Both views should get the press.
EXPECT_TRUE(view->got_gesture_event());
EXPECT_TRUE(child->got_gesture_event());
@@ -271,7 +271,7 @@
// the press.
ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(250, 251), 1,
base::TimeDelta());
- dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);
+ dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);
EXPECT_TRUE(view->got_gesture_event());
EXPECT_FALSE(child->got_gesture_event());
view->clear_got_gesture_event();
@@ -294,7 +294,7 @@
ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(41, 51), 1,
base::TimeDelta());
- dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);
+ dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
EXPECT_TRUE(view->got_gesture_event());
view->clear_got_gesture_event();
// Set the capture.
@@ -304,7 +304,7 @@
// Generate a release, this should trigger releasing capture.
ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(41, 51), 1,
base::TimeDelta());
- dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);
+ dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);
EXPECT_TRUE(view->got_gesture_event());
view->clear_got_gesture_event();
EXPECT_FALSE(widget->HasCapture());
« no previous file with comments | « trunk/src/ui/views/widget/native_widget_aura.cc ('k') | trunk/src/ui/views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698