chrome/browser/extensions/display_info_provider_chromeos_unittest.cc - Issue 1107383002: Merge Prevent DisplayPreferences from saving incorrect rotations.

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 1107383002: Merge Prevent DisplayPreferences from saving incorrect rotations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2357

Patch Set: Created 5 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 493e54c4ac7ca72264f6af428cb46a200877b620..caef15fbb5df5ddd2d88db621bc18ea5583e4ed3 100644

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

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

@@ -121,7 +121,8 @@ TEST_F(DisplayInfoProviderChromeosTest, GetRotation) {

EXPECT_EQ("0,0 600x500", SystemInfoDisplayBoundsToString(result[0]->bounds));

EXPECT_EQ(90, result[0]->rotation);

- GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_270);

+ GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_270,

+ gfx::Display::ROTATION_SOURCE_ACTIVE);

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

@@ -131,7 +132,8 @@ TEST_F(DisplayInfoProviderChromeosTest, GetRotation) {

EXPECT_EQ("0,0 600x500", SystemInfoDisplayBoundsToString(result[0]->bounds));

EXPECT_EQ(270, result[0]->rotation);

- GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_180);

+ GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_180,

+ gfx::Display::ROTATION_SOURCE_ACTIVE);

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

@@ -141,7 +143,8 @@ TEST_F(DisplayInfoProviderChromeosTest, GetRotation) {

EXPECT_EQ("0,0 500x600", SystemInfoDisplayBoundsToString(result[0]->bounds));

EXPECT_EQ(180, result[0]->rotation);

- GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_0);

+ GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_0,

+ gfx::Display::ROTATION_SOURCE_ACTIVE);

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