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

Index: trunk/src/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

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

--- trunk/src/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc (revision 285220)

+++ trunk/src/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc (working copy)

@@ -51,9 +51,8 @@

#include "ash/wm/window_util.h"

#include "chrome/browser/ui/views/frame/immersive_mode_controller.h"

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

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

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

#include "ui/aura/window_event_dispatcher.h"

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

#endif

using content::WebContents;

@@ -361,8 +360,8 @@

virtual void SetUpOnMainThread() OVERRIDE {

#if defined(OS_CHROMEOS)

- event_generator_.reset(

- new ui::test::EventGenerator(ash::Shell::GetPrimaryRootWindow()));

+ event_generator_.reset(new aura::test::EventGenerator(

+ ash::Shell::GetPrimaryRootWindow()));

#endif

}

@@ -376,7 +375,7 @@

if (input_source() == INPUT_SOURCE_MOUSE)

return;

#if defined(OS_CHROMEOS)

- event_generator_.reset(new ui::test::EventGenerator(

+ event_generator_.reset(new aura::test::EventGenerator(

new ScreenEventGeneratorDelegate(ash::wm::GetRootWindowAt(point))));

#endif

}

@@ -530,7 +529,7 @@

private:

#if defined(OS_CHROMEOS)

- scoped_ptr<ui::test::EventGenerator> event_generator_;

+ scoped_ptr<aura::test::EventGenerator> event_generator_;

#endif

DISALLOW_COPY_AND_ASSIGN(DetachToBrowserTabDragControllerTest);