diff options
| author | kalyan.kondapally@intel.com <kalyan.kondapally@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 23:41:09 +0000 |
|---|---|---|
| committer | kalyan.kondapally@intel.com <kalyan.kondapally@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 23:41:09 +0000 |
| commit | 438cbdf0d6868b16d81c49a7b77291d5e6a4e5c9 (patch) | |
| tree | 00f0fcb9fecac6c0f5f1817a617be816561e370e /ash/root_window_controller.h | |
| parent | e3d01e77364551274cc64118048d9f7d89cc7b22 (diff) | |
| download | chromium_src-438cbdf0d6868b16d81c49a7b77291d5e6a4e5c9.zip chromium_src-438cbdf0d6868b16d81c49a7b77291d5e6a4e5c9.tar.gz chromium_src-438cbdf0d6868b16d81c49a7b77291d5e6a4e5c9.tar.bz2 | |
Fix platform check in RootWindowController header.
The usage of member variable boot_splash_screen_
in root_window_controller.cc file is guarded
with ChromeOS, while in header it's done with X11.
This CL replaces X11 platform specific guard in
header with ChromeOS.
BUG=
Review URL: https://codereview.chromium.org/26168005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.h')
| -rw-r--r-- | ash/root_window_controller.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index 7820434..f5a67ee 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 @@ -259,7 +259,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 |