ash/shelf/shelf_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/shelf/shelf_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/shelf/shelf_layout_manager_unittest.cc

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

index 870396321395e06fd6098751ad954851c4f25682..6969695188ee3e2b4ceeaaf781a459544e39bea9 100644

--- a/ash/shelf/shelf_layout_manager_unittest.cc

+++ b/ash/shelf/shelf_layout_manager_unittest.cc

@@ -35,6 +35,7 @@

#include "ui/compositor/layer.h"

#include "ui/compositor/layer_animator.h"

#include "ui/compositor/scoped_animation_duration_scale_mode.h"

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

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

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

#include "ui/gfx/display.h"

@@ -947,7 +948,7 @@ TEST_F(ShelfLayoutManagerTest, AutoHideShelfOnScreenBoundary) {

UpdateDisplay("800x600,800x600");

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

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

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

// Put the primary monitor's shelf on the display boundary.

ShelfLayoutManager* shelf = GetShelfLayoutManager();

shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);

« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/sticky_keys/sticky_keys_overlay_unittest.cc » ('j') | no next file with comments »