ui/views/touchui/touch_selection_controller_impl_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/touchui/touch_selection_controller_impl_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: fix gn 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

« ui/aura/test/event_generator_delegate_aura.h ('K') | « ui/views/corewm/tooltip_controller_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/touchui/touch_selection_controller_impl_unittest.cc

diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc

index 0af64c3043e97d4a441b0e293b62549274dd0765..73cf4f0565881667cf1c3af149f375ebd73bd5ba 100644

--- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc

+++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc

@@ -6,11 +6,11 @@

#include "base/strings/utf_string_conversions.h"

#include "grit/ui_resources.h"

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

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

#include "ui/aura/window.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/touch/touch_editing_controller.h"

#include "ui/base/ui_base_switches.h"

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

#include "ui/gfx/canvas.h"

#include "ui/gfx/point.h"

#include "ui/gfx/rect.h"

@@ -543,7 +543,7 @@ TEST_F(TouchSelectionControllerImplTest,

DoubleTapInTextfieldWithCursorHandleShouldSelectText) {

CreateTextfield();

textfield_->SetText(ASCIIToUTF16("some text"));

- aura::test::EventGenerator generator(

+ ui::test::EventGenerator generator(

textfield_->GetWidget()->GetNativeView()->GetRootWindow());

// Tap the textfield to invoke touch selection.

@@ -804,7 +804,7 @@ TEST_F(TouchSelectionControllerImplTest, MouseEventDeactivatesTouchSelection) {

CreateTextfield();

EXPECT_FALSE(GetSelectionController());

- aura::test::EventGenerator generator(

+ ui::test::EventGenerator generator(

textfield_widget_->GetNativeView()->GetRootWindow());

generator.set_current_location(gfx::Point(5, 5));

@@ -845,7 +845,7 @@ TEST_F(TouchSelectionControllerImplTest, KeyEventDeactivatesTouchSelection) {

CreateTextfield();

EXPECT_FALSE(GetSelectionController());

- aura::test::EventGenerator generator(

+ ui::test::EventGenerator generator(

textfield_widget_->GetNativeView()->GetRootWindow());

RunPendingMessages();