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

Unified Diff: ash/wm/caption_buttons/frame_maximize_button_unittest.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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 | « ash/wm/base_layout_manager.cc ('k') | ash/wm/coordinate_conversion.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/caption_buttons/frame_maximize_button_unittest.cc
diff --git a/ash/wm/caption_buttons/frame_maximize_button_unittest.cc b/ash/wm/caption_buttons/frame_maximize_button_unittest.cc
index 2eaa3333d853da9832e4c247a7b7ef4151daa6ce..c2ea2e8dec587bc5729ef6dca3364b4670ede057 100644
--- a/ash/wm/caption_buttons/frame_maximize_button_unittest.cc
+++ b/ash/wm/caption_buttons/frame_maximize_button_unittest.cc
@@ -535,7 +535,7 @@ TEST_F(FrameMaximizeButtonTest, MaximizeKeepFocus) {
TEST_F(FrameMaximizeButtonTest, MaximizeTap) {
aura::Window* window = widget()->GetNativeWindow();
- aura::RootWindow* root_window = window->GetRootWindow();
+ aura::Window* root_window = window->GetRootWindow();
ash::FrameMaximizeButton* maximize_button =
FrameMaximizeButtonTest::maximize_button();
gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
@@ -544,12 +544,13 @@ TEST_F(FrameMaximizeButtonTest, MaximizeTap) {
ui::GestureConfiguration::default_radius();
ui::GestureConfiguration::set_default_radius(0);
+ aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
const int kTouchId = 2;
ui::TouchEvent press(ui::ET_TOUCH_PRESSED,
button_pos,
kTouchId,
ui::EventTimeForNow());
- root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
+ dispatcher->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
button_pos.Offset(9, 8);
ui::TouchEvent release(
@@ -557,7 +558,7 @@ TEST_F(FrameMaximizeButtonTest, MaximizeTap) {
button_pos,
kTouchId,
press.time_stamp() + base::TimeDelta::FromMilliseconds(50));
- root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);
+ dispatcher->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);
ui::GestureConfiguration::set_default_radius(touch_default_radius);
}
« no previous file with comments | « ash/wm/base_layout_manager.cc ('k') | ash/wm/coordinate_conversion.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698