chrome/browser/extensions/display_info_provider_chromeos_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: chrome/browser/extensions/display_info_provider_chromeos_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

« no previous file with comments | « chrome/browser/extensions/display_info_provider_chromeos.cc ('k') | chrome/browser/ui/webui/options/chromeos/display_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

diff --git a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

index 3e4e5c7047249e34a08d893b83f1f6dfe27d8b87..44dd3d569827fc94d6f2a4a94b6403cdd1b426cc 100644

--- a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

+++ b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

@@ -19,6 +19,7 @@

#include "base/strings/string_number_conversions.h"

#include "base/strings/stringprintf.h"

#include "extensions/common/api/system_display.h"

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

#include "ui/gfx/display.h"

#include "ui/gfx/geometry/rect.h"

@@ -401,7 +402,7 @@ TEST_F(DisplayInfoProviderChromeosTest, GetMirroring) {

TEST_F(DisplayInfoProviderChromeosTest, GetBounds) {

UpdateDisplay("600x600, 400x520");

GetDisplayManager()->SetLayoutForCurrentDisplays(

- ash::test::CreateDisplayLayout(ash::DisplayPlacement::LEFT, -40));

+ ash::test::CreateDisplayLayout(display::DisplayPlacement::LEFT, -40));

DisplayInfo result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();

@@ -411,7 +412,7 @@ TEST_F(DisplayInfoProviderChromeosTest, GetBounds) {

SystemInfoDisplayBoundsToString(result[1].bounds));

GetDisplayManager()->SetLayoutForCurrentDisplays(

- ash::test::CreateDisplayLayout(ash::DisplayPlacement::TOP, 40));

+ ash::test::CreateDisplayLayout(display::DisplayPlacement::TOP, 40));

result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();

@@ -421,7 +422,7 @@ TEST_F(DisplayInfoProviderChromeosTest, GetBounds) {

SystemInfoDisplayBoundsToString(result[1].bounds));

GetDisplayManager()->SetLayoutForCurrentDisplays(

- ash::test::CreateDisplayLayout(ash::DisplayPlacement::BOTTOM, 80));

+ ash::test::CreateDisplayLayout(display::DisplayPlacement::BOTTOM, 80));

result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();

ASSERT_EQ(2u, result.size());