ui/views/test/views_test_base.cc - Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object.

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/views/test/views_test_base.cc

Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 8 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/views/test/views_test_base.cc

diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc

index 1e05f503532fdff629a1aa9f1cb7b21a95ecd256..c77529247f5a3319c8ea8bfe40bb11771e5616ca 100644

--- a/ui/views/test/views_test_base.cc

+++ b/ui/views/test/views_test_base.cc

@@ -4,10 +4,6 @@

#include "ui/views/test/views_test_base.h"

-#if defined(USE_ASH)

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

-#endif

#if defined(USE_AURA)

#include "base/compiler_specific.h"

#include "ui/aura/client/aura_constants.h"

@@ -16,8 +12,10 @@

#include "ui/aura/root_window.h"

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

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

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

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

#include "ui/base/ime/input_method.h"

+#include "ui/gfx/screen.h"

namespace {