trunk/src/ash/root_window_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/root_window_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/magnifier/magnification_controller_unittest.cc ('k') | trunk/src/ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/ash/root_window_controller_unittest.cc

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

--- trunk/src/ash/root_window_controller_unittest.cc (revision 285220)

+++ trunk/src/ash/root_window_controller_unittest.cc (working copy)

@@ -19,6 +19,7 @@

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

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

#include "ui/aura/env.h"

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

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

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

#include "ui/aura/window.h"

@@ -29,7 +30,6 @@

#include "ui/base/ime/text_input_client.h"

#include "ui/base/ime/text_input_focus_manager.h"

#include "ui/base/ui_base_switches_util.h"

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

#include "ui/events/test/test_event_handler.h"

#include "ui/keyboard/keyboard_controller_proxy.h"

#include "ui/keyboard/keyboard_switches.h"

@@ -281,7 +281,7 @@

modal->GetNativeView()));

EXPECT_TRUE(wm::IsActiveWindow(modal->GetNativeView()));

- ui::test::EventGenerator generator_1st(root_windows[0]);

+ aura::test::EventGenerator generator_1st(root_windows[0]);

generator_1st.ClickLeftButton();

EXPECT_TRUE(wm::IsActiveWindow(modal->GetNativeView()));

@@ -688,7 +688,7 @@

ui::test::TestEventHandler handler;

root_window->AddPreTargetHandler(&handler);

- ui::test::EventGenerator event_generator(root_window, keyboard_window);

+ aura::test::EventGenerator event_generator(root_window, keyboard_window);

event_generator.ClickLeftButton();

int expected_mouse_presses = 1;

EXPECT_EQ(expected_mouse_presses, handler.num_mouse_events() / 2);

@@ -773,9 +773,9 @@

ui::test::TestEventHandler handler;

root_window->AddPreTargetHandler(&handler);

- ui::test::EventGenerator root_window_event_generator(root_window);

- ui::test::EventGenerator keyboard_event_generator(root_window,

- keyboard_window);

+ aura::test::EventGenerator root_window_event_generator(root_window);

+ aura::test::EventGenerator keyboard_event_generator(root_window,

+ keyboard_window);

views::Widget* modal_widget =

CreateModalWidget(gfx::Rect(300, 10, 100, 100));