exo: Run exo in mus+ash

components/exo/display.h

Index: components/exo/display.h
diff --git a/components/exo/display.h b/components/exo/display.h
index 26ef0ca80827b8571975e60d3f9318e165646988..d53c532f3bd8f3cea654a9c30ab95963fb812164 100644
--- a/components/exo/display.h
+++ b/components/exo/display.h
@@ -31,6 +31,7 @@ class SharedMemory;
 class ShellSurface;
 class SubSurface;
 class Surface;
+class WMHelper;
 
 #if defined(USE_OZONE)
 class Buffer;
@@ -42,7 +43,8 @@ class Buffer;
 class Display {
  public:
   Display();
-  explicit Display(NotificationSurfaceManager* notification_surface_manager);
+  Display(bool using_mus,
+          NotificationSurfaceManager* notification_surface_manager);
   ~Display();
 
   // Creates a new surface.
@@ -88,6 +90,7 @@ class Display {
       const std::string& notification_id);
 
  private:
+  std::unique_ptr<WMHelper> wm_helper_;
   NotificationSurfaceManager* const notification_surface_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);