ash/wm/dock/docked_window_layout_manager_unittest.cc - Issue 1838833002: Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

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/wm/dock/docked_window_layout_manager_unittest.cc

Issue 1838833002: Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screenwinmove

Patch Set: Fix comment Created 4 years, 8 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/wm/dock/docked_window_layout_manager_unittest.cc

diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc

index 5ff61a1de86559a3615f37259fea09c533ccb291..9755749cadc540469c5c8659e229df1b83b3a1f1 100644

--- a/ash/wm/dock/docked_window_layout_manager_unittest.cc

+++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc

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

#include "ui/aura/window.h"

#include "ui/aura/window_event_dispatcher.h"

#include "ui/base/hit_test.h"

+#include "ui/display/manager/display_layout.h"

#include "ui/gfx/screen.h"

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

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

@@ -544,7 +545,7 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDraggingSecondScreen) {

// Layout the secondary display to the bottom of the primary.

ASSERT_GT(gfx::Screen::GetScreen()->GetNumDisplays(), 1);

Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(

- test::CreateDisplayLayout(DisplayPlacement::BOTTOM, 0));

+ test::CreateDisplayLayout(display::DisplayPlacement::BOTTOM, 0));

scoped_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(0, 1000, 201, 310)));

DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w1.get(), 1000 + 20);

« no previous file with comments | « ash/touch/touch_transformer_controller.cc ('k') | ash/wm/drag_window_resizer_unittest.cc » ('j') | no next file with comments »