content/browser/renderer_host/render_widget_host_view_aura_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: content/browser/renderer_host/render_widget_host_view_aura_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 | « chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc ('k') | content/browser/web_contents/aura/window_slider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

index 2e4cab08c6551720ba91384abdc906e421e0321b..a5cf62b1fd08cfcbcecd9325d389a7026ecae180 100644

--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

@@ -39,7 +39,6 @@

#include "ui/aura/env.h"

#include "ui/aura/layout_manager.h"

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

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

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

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

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

@@ -52,6 +51,7 @@

#include "ui/events/event.h"

#include "ui/events/event_utils.h"

#include "ui/events/gestures/gesture_configuration.h"

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

#include "ui/wm/core/default_activation_client.h"

using testing::_;

@@ -715,7 +715,7 @@ TEST_F(RenderWidgetHostViewAuraTest, DestroyPopupClickOutsidePopup) {

EXPECT_FALSE(parent_window->GetBoundsInRootWindow().Contains(click_point));

TestWindowObserver observer(window);

- aura::test::EventGenerator generator(window->GetRootWindow(), click_point);

+ ui::test::EventGenerator generator(window->GetRootWindow(), click_point);

generator.ClickLeftButton();

ASSERT_TRUE(parent_view_->HasFocus());

ASSERT_TRUE(observer.destroyed());

@@ -742,7 +742,7 @@ TEST_F(RenderWidgetHostViewAuraTest, DestroyPopupTapOutsidePopup) {

EXPECT_FALSE(parent_window->GetBoundsInRootWindow().Contains(tap_point));

TestWindowObserver observer(window);

- aura::test::EventGenerator generator(window->GetRootWindow(), tap_point);

+ ui::test::EventGenerator generator(window->GetRootWindow(), tap_point);

generator.GestureTapAt(tap_point);

ASSERT_TRUE(parent_view_->HasFocus());

ASSERT_TRUE(observer.destroyed());