ui/views/widget/desktop_aura/desktop_screen_x11_unittest.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: ui/views/widget/desktop_aura/desktop_screen_x11_unittest.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 | « ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

index 0451d788119580643e5d51abbc09d29521c30d58..75a71acea5cbdfa5f483e09658347dc802676a27 100644

--- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

+++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

@@ -7,11 +7,11 @@

#include "base/memory/scoped_ptr.h"

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

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

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

#include "ui/aura/window.h"

#include "ui/aura/window_event_dispatcher.h"

#include "ui/base/hit_test.h"

#include "ui/base/x/x11_util.h"

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

#include "ui/gfx/display_observer.h"

#include "ui/gfx/x/x11_types.h"

#include "ui/views/test/views_test_base.h"

@@ -290,7 +290,7 @@ TEST_F(DesktopScreenX11Test, DoubleClickHeaderMaximizes) {

DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->

GetAcceleratedWidget());

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

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

generator.ClickLeftButton();

generator.DoubleClickLeftButton();

RunPendingMessages();

@@ -316,7 +316,7 @@ TEST_F(DesktopScreenX11Test, DoubleClickTwoDifferentTargetsDoesntMaximizes) {

DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->

GetAcceleratedWidget());

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

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

native_widget->set_window_component(HTCLIENT);

generator.ClickLeftButton();

native_widget->set_window_component(HTCAPTION);

@@ -343,7 +343,7 @@ TEST_F(DesktopScreenX11Test, RightClickDuringDoubleClickDoesntMaximize) {

DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->

GetAcceleratedWidget()));

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

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

native_widget->set_window_component(HTCLIENT);

generator.ClickLeftButton();

native_widget->set_window_component(HTCAPTION);