trunk/src/chrome/browser/ui/views/ash/tab_scrubber_browsertest.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/chrome/browser/ui/views/ash/tab_scrubber_browsertest.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/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc ('k') | trunk/src/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc

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

--- trunk/src/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc (revision 285220)

+++ trunk/src/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc (working copy)

@@ -22,9 +22,9 @@

#include "content/public/browser/notification_service.h"

#include "content/public/common/url_constants.h"

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

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

#include "ui/aura/window.h"

#include "ui/events/event_utils.h"

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

#if defined(OS_CHROMEOS)

#include "chromeos/chromeos_switches.h"

@@ -80,7 +80,7 @@

void SendScrubEvent(Browser* browser, int index) {

aura::Window* window = browser->window()->GetNativeWindow();

aura::Window* root = window->GetRootWindow();

- ui::test::EventGenerator event_generator(root, window);

+ aura::test::EventGenerator event_generator(root, window);

int active_index = browser->tab_strip_model()->active_index();

TabScrubber::Direction direction = index < active_index ?

TabScrubber::LEFT : TabScrubber::RIGHT;

@@ -107,7 +107,7 @@

void Scrub(Browser* browser, int index, ScrubType scrub_type) {

aura::Window* window = browser->window()->GetNativeWindow();

aura::Window* root = window->GetRootWindow();

- ui::test::EventGenerator event_generator(root, window);

+ aura::test::EventGenerator event_generator(root, window);

event_generator.set_async(true);

activation_order_.clear();

int active_index = browser->tab_strip_model()->active_index();

@@ -150,7 +150,7 @@

void SendScrubSequence(Browser* browser, int x_offset, int index) {

aura::Window* window = browser->window()->GetNativeWindow();

aura::Window* root = window->GetRootWindow();

- ui::test::EventGenerator event_generator(root, window);

+ aura::test::EventGenerator event_generator(root, window);

bool wait_for_active = false;

if (index != browser->tab_strip_model()->active_index()) {

wait_for_active = true;