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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/ash/wm/workspace/multi_window_resize_controller_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/window_modality_controller_unittest.cc ('k') | trunk/src/ash/wm/workspace/workspace_event_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

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

@@ -8,13 +8,13 @@

#include "ash/test/ash_test_base.h"

#include "ash/test/shell_test_api.h"

#include "ash/wm/window_util.h"

-#include "ash/wm/workspace/workspace_event_handler_test_helper.h"

#include "ash/wm/workspace_controller.h"

#include "ash/wm/workspace_controller_test_helper.h"

+#include "ash/wm/workspace/workspace_event_handler_test_helper.h"

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

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

#include "ui/aura/window.h"

#include "ui/base/hit_test.h"

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

#include "ui/gfx/screen.h"

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

@@ -105,7 +105,7 @@

scoped_ptr<aura::Window> w2(

CreateTestWindow(&delegate2, gfx::Rect(100, 0, 100, 100)));

delegate2.set_window_component(HTRIGHT);

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

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

generator.MoveMouseTo(w1->bounds().CenterPoint());

EXPECT_TRUE(HasPendingShow());

EXPECT_TRUE(IsShowing());

@@ -136,7 +136,7 @@

scoped_ptr<aura::Window> w2(

CreateTestWindow(&delegate2, gfx::Rect(100, 0, 100, 100)));

delegate2.set_window_component(HTRIGHT);

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

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

generator.MoveMouseTo(w1->bounds().CenterPoint());

EXPECT_TRUE(HasPendingShow());

EXPECT_TRUE(IsShowing());

@@ -179,7 +179,7 @@

scoped_ptr<aura::Window> w2(

CreateTestWindow(&delegate2, gfx::Rect(100, 0, 100, 100)));

delegate2.set_window_component(HTRIGHT);

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

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

generator.MoveMouseTo(w1->bounds().CenterPoint());

EXPECT_TRUE(HasPendingShow());

EXPECT_TRUE(IsShowing());

@@ -227,7 +227,7 @@

CreateTestWindow(&delegate3, gfx::Rect(200, 0, 100, 100)));

delegate3.set_window_component(HTRIGHT);

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

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

generator.MoveMouseTo(w1->bounds().CenterPoint());

EXPECT_TRUE(HasPendingShow());

EXPECT_TRUE(IsShowing());