chrome/browser/extensions/display_info_provider_chromeos_unittest.cc - Issue 2270553002: Move ash::DisplayInfo to ui

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 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased Created 4 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

« no previous file with comments | « chrome/browser/extensions/display_info_provider_chromeos.cc ('k') | chrome/browser/signin/easy_unlock_service_regular.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 125c080f81bcb02255e9205e5e7d18ebeccfc20a..da316b62221f7309f437666f84eee84da586276a 100644

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

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

@@ -1150,7 +1150,7 @@ TEST_F(DisplayInfoProviderChromeosTest, DisplayMode) {

// Get the currently active mode and one other mode to switch to.

int64_t id;

base::StringToInt64(primary_info.id, &id);

- scoped_refptr<ash::ManagedDisplayMode> active_mode =

+ scoped_refptr<display::ManagedDisplayMode> active_mode =

GetDisplayManager()->GetActiveModeForDisplayId(id);

const api::system_display::DisplayMode* cur_mode = nullptr;

const api::system_display::DisplayMode* other_mode = nullptr;

@@ -1167,8 +1167,8 @@ TEST_F(DisplayInfoProviderChromeosTest, DisplayMode) {

ASSERT_NE(other_mode, cur_mode);

// Verify that other_mode differs from the active mode.

- scoped_refptr<ash::ManagedDisplayMode> other_mode_ash(

- new ash::ManagedDisplayMode(

+ scoped_refptr<display::ManagedDisplayMode> other_mode_ash(

+ new display::ManagedDisplayMode(

gfx::Size(other_mode->width_in_native_pixels,

other_mode->height_in_native_pixels),

active_mode->refresh_rate(), active_mode->is_interlaced(),