trunk/src/ash/wm/maximize_mode/maximize_mode_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/maximize_mode/maximize_mode_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:

Index: trunk/src/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

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

--- trunk/src/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc (revision 285220)

+++ trunk/src/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc (working copy)

@@ -14,8 +14,8 @@

#include "ash/test/test_screenshot_delegate.h"

#include "ash/test/test_system_tray_delegate.h"

#include "ash/test/test_volume_control_delegate.h"

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

#include "ui/events/event_handler.h"

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

#include "ui/gfx/vector3d_f.h"

#include "ui/message_center/message_center.h"

@@ -270,7 +270,7 @@

Shell::GetInstance()->lock_state_controller()->SetDelegate(

new test::TestLockStateControllerDelegate);

aura::Window* root = Shell::GetPrimaryRootWindow();

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

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

test::TestScreenshotDelegate* delegate = GetScreenshotDelegate();

delegate->set_can_take_screenshot(true);