ui/gfx/screen.h - 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: ui/gfx/screen.h

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: ui/gfx/screen.h

diff --git a/ui/gfx/screen.h b/ui/gfx/screen.h

index cd363b366985b4a519c0a3784875a9b5fcf3d25f..b65eec5515ff41896844ab7159e05a1481919f92 100644

--- a/ui/gfx/screen.h

+++ b/ui/gfx/screen.h

@@ -20,7 +20,7 @@ class UI_EXPORT Screen {

public:

virtual ~Screen() {}

-#if defined(USE_AURA)

+#if defined(USE_ASH)

// Sets the instance to use. This takes owernship of |screen|, deleting the

// old instance. This is used on aura to avoid circular dependencies between

// ui and aura.

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