content/shell/browser/shell_views.cc - Issue 1608733002: Remove ui/gfx/screen_type_delegate.h

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: content/shell/browser/shell_views.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4

Patch Set: and another rebase Created 4 years, 11 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:

Index: content/shell/browser/shell_views.cc

diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc

index a16fdc006feb50c7ac0d2e93a1b63b3d65ddd19d..2de6867909841b1d8978bfbd7f3ea183e9fa686d 100644

--- a/content/shell/browser/shell_views.cc

+++ b/content/shell/browser/shell_views.cc

@@ -397,12 +397,11 @@ void Shell::PlatformInitialize(const gfx::Size& default_window_size) {

#endif

#if defined(OS_CHROMEOS)

test_screen_ = aura::TestScreen::Create(gfx::Size());

- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_);

+ gfx::Screen::SetScreenInstance(test_screen_);

wm_test_helper_ = new wm::WMTestHelper(default_window_size,

GetContextFactory());

#else

- gfx::Screen::SetScreenInstance(

- gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());

+ gfx::Screen::SetScreenInstance(views::CreateDesktopScreen());

#endif

views_delegate_ = new views::DesktopTestViewsDelegate();

}