exo: Run exo in mus+ash

components/exo/display.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_EXO_DISPLAY_H_
 #define COMPONENTS_EXO_DISPLAY_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 13 matching lines @@
 class Point;
 }
 
 namespace exo {
 class NotificationSurface;
 class NotificationSurfaceManager;
 class SharedMemory;
 class ShellSurface;
 class SubSurface;
 class Surface;
+class WMHelper;
 
 #if defined(USE_OZONE)
 class Buffer;
 #endif
 
 // The core display class. This class provides functions for creating surfaces
 // and is in charge of combining the contents of multiple surfaces into one
 // displayable output.
 class Display {
  public:
   Display();
-  explicit Display(NotificationSurfaceManager* notification_surface_manager);
+  Display(bool using_mus,
+          NotificationSurfaceManager* notification_surface_manager);
   ~Display();
 
   // Creates a new surface.
   std::unique_ptr<Surface> CreateSurface();
 
   // Creates a shared memory segment from |handle| of |size| with the
   // given |id|. This function takes ownership of |handle|.
   std::unique_ptr<SharedMemory> CreateSharedMemory(
       const base::SharedMemoryHandle& handle,
       size_t size);
@@ skipping 25 matching lines @@
   // a child of |parent|.
   std::unique_ptr<SubSurface> CreateSubSurface(Surface* surface,
                                                Surface* parent);
 
   // Creates a notification surface for a surface and notification id.
   std::unique_ptr<NotificationSurface> CreateNotificationSurface(
       Surface* surface,
       const std::string& notification_id);
 
  private:
+  std::unique_ptr<WMHelper> wm_helper_;
   NotificationSurfaceManager* const notification_surface_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_DISPLAY_H_