| Index: ash/root_window_controller.h
|
| diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
|
| index 7a61c55ba13ddf278322318db8e5fc8ca489f3bd..3588097eb45be8ed561c5996c2ea5d1f06d65d03 100644
|
| --- a/ash/root_window_controller.h
|
| +++ b/ash/root_window_controller.h
|
| @@ -40,7 +40,9 @@ class ScopedCaptureClient;
|
| }
|
|
|
| namespace ash {
|
| +class AshTouchExplorationManager;
|
| class AshWindowTreeHost;
|
| +class BootSplashScreen;
|
| class DockedWindowLayoutManager;
|
| enum class LoginStatus;
|
| class PanelLayoutManager;
|
| @@ -55,11 +57,6 @@ class WmRootWindowControllerAura;
|
| class WmShelfAura;
|
| class WorkspaceController;
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -class BootSplashScreen;
|
| -class AshTouchExplorationManager;
|
| -#endif
|
| -
|
| // This class maintains the per root window state for ash. This class
|
| // owns the root window and other dependent objects that should be
|
| // deleted upon the deletion of the root window. This object is
|
| @@ -223,12 +220,10 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
|
|
|
| std::unique_ptr<SystemWallpaperController> system_wallpaper_;
|
|
|
| -#if defined(OS_CHROMEOS)
|
| std::unique_ptr<BootSplashScreen> boot_splash_screen_;
|
| // Responsible for initializing TouchExplorationController when spoken
|
| // feedback is on.
|
| std::unique_ptr<AshTouchExplorationManager> touch_exploration_manager_;
|
| -#endif
|
|
|
| // Heads-up displays for touch events. These HUDs are not owned by the root
|
| // window controller and manage their own lifetimes.
|
|
|