ash/root_window_controller.h - Issue 25108005: linux_aura: Compile ash into chrome.

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: ash/root_window_controller.h

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix chromeos link Created 7 years, 3 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: ash/root_window_controller.h

diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h

index 49ce6b89f89ab2d10e90b6fb5f1c2c68a7e9bda2..8bac8bb910c5e55ca0216ecd1e7bd7441c916fb1 100644

--- a/ash/root_window_controller.h

+++ b/ash/root_window_controller.h

@@ -64,7 +64,7 @@ class TouchHudDebug;

class TouchHudProjection;

class WorkspaceController;

-#if defined(USE_X11)

+#if defined(OS_CHROMEOS)

class BootSplashScreen;

#endif

@@ -262,7 +262,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {

PanelLayoutManager* panel_layout_manager_;

scoped_ptr<SystemBackgroundController> system_background_;

-#if defined(USE_X11)

+#if defined(OS_CHROMEOS)

scoped_ptr<BootSplashScreen> boot_splash_screen_;

#endif