ui/aura/test/aura_test_helper.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: ui/aura/test/aura_test_helper.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: GetNativeScreen 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: ui/aura/test/aura_test_helper.cc

diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc

index 9d8c305201e7eb51ab72147183a06bb1f887ceb7..bc7f0caf14de79bf661a4eda5cd1b0452e94fff0 100644

--- a/ui/aura/test/aura_test_helper.cc

+++ b/ui/aura/test/aura_test_helper.cc

@@ -72,7 +72,7 @@ void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {

gfx::Size host_size(800, 600);

test_screen_.reset(TestScreen::Create(host_size));

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

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

host_.reset(test_screen_->CreateHostForPrimaryDisplay());

focus_client_.reset(new TestFocusClient);

@@ -94,7 +94,7 @@ void AuraTestHelper::TearDown() {

host_.reset();

ui::GestureRecognizer::Reset();

test_screen_.reset();

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

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

#if defined(USE_X11)

ui::test::ResetXCursorCache();