ash/shelf/shelf_view_unittest.cc - Issue 425363002: Moving coordinate conversion methods from ash/wm to ui/wm.

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: ash/shelf/shelf_view_unittest.cc

Issue 425363002: Moving coordinate conversion methods from ash/wm to ui/wm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More fixes Created 6 years, 4 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

Index: ash/shelf/shelf_view_unittest.cc

diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc

index 1d7a8d0f51355cd3d1f5738cf0e43aeb76146288..fc9b0767b05af4b045564102e6c301f4e926851d 100644

--- a/ash/shelf/shelf_view_unittest.cc

+++ b/ash/shelf/shelf_view_unittest.cc

@@ -29,7 +29,6 @@

#include "ash/test/shell_test_api.h"

#include "ash/test/test_shelf_delegate.h"

#include "ash/test/test_shelf_item_delegate.h"

-#include "ash/wm/coordinate_conversion.h"

#include "base/basictypes.h"

#include "base/command_line.h"

#include "base/compiler_specific.h"

@@ -47,6 +46,7 @@

#include "ui/views/view_model.h"

#include "ui/views/widget/widget.h"

#include "ui/views/widget/widget_delegate.h"

+#include "ui/wm/core/coordinate_conversion.h"

namespace ash {

namespace test {

@@ -1604,7 +1604,7 @@ TEST_F(ShelfViewTest, CheckRipOffFromLeftShelfAlignmentWithMultiMonitor) {

// Fetch the start point of dragging.

gfx::Point start_point = button->GetBoundsInScreen().CenterPoint();

- wm::ConvertPointFromScreen(second_root, &start_point);

+ ::wm::ConvertPointFromScreen(second_root, &start_point);

ui::test::EventGenerator generator(second_root, start_point);

« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »