ui/aura/test/aura_test_helper.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

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 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix new addition Created 8 years, 2 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

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 1453c867027b294664fed55b08e5d136e0349ca3..0b90c201f213cc63e3eb631477d725cf7e19be06 100644

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

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

@@ -46,7 +46,8 @@ void AuraTestHelper::SetUp() {

setup_called_ = true;

Env::GetInstance()->SetDisplayManager(new SingleDisplayManager);

root_window_.reset(aura::DisplayManager::CreateRootWindowForPrimaryDisplay());

- gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));

+ gfx::Screen::SetScreenInstance(

+ gfx::SCREEN_TYPE_NATIVE, new aura::TestScreen(root_window_.get()));

ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));

focus_manager_.reset(new FocusManager);

« no previous file with comments | « ui/aura/root_window_host_linux.cc ('k') | ui/aura/test/test_screen.h » ('j') | no next file with comments »