chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc - Issue 406413004: Cleanups for aura/test/event_generator.h (resolve TODOs)

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: chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc

Issue 406413004: Cleanups for aura/test/event_generator.h (resolve TODOs) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase at r285842 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 | « athena/screen/screen_manager_unittest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc

diff --git a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc

index b03c6fe71b72c4c65f6d49795ce80d7f94c62e7f..ed22cac686682d2be8ed80eb39bd67b8c8af8ef9 100644

--- a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc

+++ b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc

@@ -17,12 +17,12 @@

#include "chrome/test/base/ui_test_utils.h"

#include "content/public/test/browser_test_utils.h"

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

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

#include "ui/aura/window_tree_host.h"

#include "ui/compositor/compositor.h"

#include "ui/compositor/test/draw_waiter_for_test.h"

#include "ui/events/event.h"

#include "ui/events/event_utils.h"

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

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

namespace ui {

@@ -88,7 +88,7 @@ private:

// after the touch exploration mode is turned off.

IN_PROC_BROWSER_TEST_F(TouchExplorationTest, ToggleOnOff) {

SwitchTouchExplorationMode(true);

- aura::test::EventGenerator generator(root_window_);

+ ui::test::EventGenerator generator(root_window_);

base::TimeDelta initial_time = Now();

ui::TouchEvent initial_press(

@@ -140,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(TouchExplorationTest, ToggleOnOff) {

// finger is still on the screen.

IN_PROC_BROWSER_TEST_F(TouchExplorationTest, SplitTapExplore) {

SwitchTouchExplorationMode(true);

- aura::test::EventGenerator generator(root_window_);

+ ui::test::EventGenerator generator(root_window_);

aura::client::CursorClient* cursor_client =

aura::client::GetCursorClient(root_window_);