trunk/src/ash/accelerators/accelerator_filter_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/accelerators/accelerator_filter_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/accelerators/accelerator_controller_unittest.cc ('k') | trunk/src/ash/accelerators/magnifier_key_scroller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/ash/accelerators/accelerator_filter_unittest.cc

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

--- trunk/src/ash/accelerators/accelerator_filter_unittest.cc (revision 285220)

+++ trunk/src/ash/accelerators/accelerator_filter_unittest.cc (working copy)

@@ -15,10 +15,10 @@

#include "base/memory/scoped_ptr.h"

#include "testing/gtest/include/gtest/gtest.h"

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

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

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

#include "ui/aura/window.h"

#include "ui/events/event.h"

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

#include "ui/gfx/rect.h"

namespace ash {

@@ -31,7 +31,7 @@

const TestScreenshotDelegate* delegate = GetScreenshotDelegate();

EXPECT_EQ(0, delegate->handle_take_screenshot_count());

- ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());

+ aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());

// AcceleratorController calls ScreenshotDelegate::HandleTakeScreenshot() when

// VKEY_PRINT is pressed. See kAcceleratorData[] in accelerator_controller.cc.

generator.PressKey(ui::VKEY_PRINT, 0);

@@ -54,7 +54,7 @@

// AcceleratorFilter should ignore the key events since the root window is

// not focused.

- ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());

+ aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());

generator.PressKey(ui::VKEY_PRINT, 0);

EXPECT_EQ(0, delegate->handle_take_screenshot_count());

generator.ReleaseKey(ui::VKEY_PRINT, 0);

@@ -69,7 +69,7 @@

const TestScreenshotDelegate* delegate = GetScreenshotDelegate();

EXPECT_EQ(0, delegate->handle_take_screenshot_count());

- ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());

+ aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());

generator.PressKey(ui::VKEY_PRINT, 0);

EXPECT_EQ(1, delegate->handle_take_screenshot_count());

generator.ReleaseKey(ui::VKEY_PRINT, 0);