chrome/test/base/browser_with_test_window_test.cc - Issue 9616045: Aura/Ash split: Move ScreenAura to ash::ScreenAsh.

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/test/base/browser_with_test_window_test.cc

Issue 9616045: Aura/Ash split: Move ScreenAura to ash::ScreenAsh. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use a separate aura::TestScreen in tests instead, partially reverting to patchset 2 Created 8 years, 9 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: chrome/test/base/browser_with_test_window_test.cc

diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc

index 1595939253305e80438980a9623df4a425f06477..19129cd96d5bbde2d1b31b0491b519dfa3c1b5df 100644

--- a/chrome/test/base/browser_with_test_window_test.cc

+++ b/chrome/test/base/browser_with_test_window_test.cc

@@ -21,6 +21,7 @@

#if defined(USE_AURA)

#include "ui/aura/root_window.h"

#include "ui/aura/test/test_activation_client.h"

+#include "ui/aura/test/test_screen.h"

#include "ui/aura/test/test_stacking_client.h"

#endif

@@ -50,6 +51,7 @@ void BrowserWithTestWindowTest::SetUp() {

browser_->SetWindowForTesting(window_.get());

#if defined(USE_AURA)

root_window_.reset(new aura::RootWindow);

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

test_activation_client_.reset(

new aura::test::TestActivationClient(root_window_.get()));

test_stacking_client_.reset(