Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Unified Diff: ash/root_window_controller.h

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698