trunk/src/ash/wm/workspace/workspace_window_resizer_unittest.cc - Issue 413983006: Revert 285209 "Cleanups for aura/test/event_generator.h (resolve..."

Unified Diff: trunk/src/ash/wm/workspace/workspace_window_resizer_unittest.cc

Issue 413983006: Revert 285209 "Cleanups for aura/test/event_generator.h (resolve..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 5 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 | « trunk/src/ash/wm/workspace/workspace_event_handler_unittest.cc ('k') | trunk/src/ash/wm/workspace_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/ash/wm/workspace/workspace_window_resizer_unittest.cc

===================================================================

--- trunk/src/ash/wm/workspace/workspace_window_resizer_unittest.cc (revision 285220)

+++ trunk/src/ash/wm/workspace/workspace_window_resizer_unittest.cc (working copy)

@@ -20,11 +20,11 @@

#include "base/strings/string_number_conversions.h"

#include "base/strings/stringprintf.h"

#include "ui/aura/client/aura_constants.h"

+#include "ui/aura/test/event_generator.h"

#include "ui/aura/test/test_window_delegate.h"

#include "ui/aura/window_event_dispatcher.h"

#include "ui/base/hit_test.h"

#include "ui/events/gestures/gesture_configuration.h"

-#include "ui/events/test/event_generator.h"

#include "ui/gfx/insets.h"

#include "ui/gfx/screen.h"

#include "ui/views/widget/widget.h"

@@ -514,7 +514,7 @@

window2_->SetBounds(gfx::Rect(400, 200, 100, 200));

Shell* shell = Shell::GetInstance();

- ui::test::EventGenerator generator(window_->GetRootWindow());

+ aura::test::EventGenerator generator(window_->GetRootWindow());

// The cursor should not be locked initially.

EXPECT_FALSE(shell->cursor_manager()->IsCursorLocked());

@@ -1739,8 +1739,8 @@

EXPECT_EQ(gfx::Rect(100, 100, 600, kRootHeight - 200).ToString(),

touch_resize_window_->bounds().ToString());

- ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),

- touch_resize_window_.get());

+ aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),

+ touch_resize_window_.get());

// Drag out of the right border a bit and check if the border is aligned with

// the touch point.

@@ -1773,8 +1773,8 @@

EXPECT_EQ(gfx::Rect(100, 100, 600, kRootHeight - 200).ToString(),

touch_resize_window_->bounds().ToString());

- ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),

- touch_resize_window_.get());

+ aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),

+ touch_resize_window_.get());

// Drag out of the left border a bit and check if the border is aligned with

// the touch point.

@@ -1807,8 +1807,8 @@

EXPECT_EQ(gfx::Rect(100, 100, 600, kRootHeight - 200).ToString(),

touch_resize_window_->bounds().ToString());

- ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),

- touch_resize_window_.get());

+ aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),

+ touch_resize_window_.get());

// Drag out of the top border a bit and check if the border is aligned with

// the touch point.

@@ -1841,8 +1841,8 @@

EXPECT_EQ(gfx::Rect(100, 100, 600, kRootHeight - 200).ToString(),

touch_resize_window_->bounds().ToString());

- ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),

- touch_resize_window_.get());

+ aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),

+ touch_resize_window_.get());

// Drag out of the bottom border a bit and check if the border is aligned with

// the touch point.