exo: Run exo in mus+ash

components/exo/display.cc

 // 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.
 
 #include "components/exo/display.h"
 
 #include <iterator>
 #include <utility>
 
 #include "ash/common/shell_window_ids.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "components/exo/notification_surface.h"
 #include "components/exo/notification_surface_manager.h"
 #include "components/exo/shared_memory.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/sub_surface.h"
 #include "components/exo/surface.h"
+#include "components/exo/wm_helper.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_OZONE)
 #include <GLES2/gl2extchromium.h>
 #include "components/exo/buffer.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/aura/env.h"
 #endif
 
 namespace exo {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Display, public:
 
 Display::Display() : notification_surface_manager_(nullptr) {}
 
-Display::Display(NotificationSurfaceManager* notification_surface_manager)
-    : notification_surface_manager_(notification_surface_manager) {}
+Display::Display(bool using_mus,
+                 NotificationSurfaceManager* notification_surface_manager)
+    : wm_helper_(WMHelper::Create(using_mus)),
+      notification_surface_manager_(notification_surface_manager) {}
 
 Display::~Display() {}
 
 std::unique_ptr<Surface> Display::CreateSurface() {
   TRACE_EVENT0("exo", "Display::CreateSurface");
 
   return base::WrapUnique(new Surface);
 }
 
 std::unique_ptr<SharedMemory> Display::CreateSharedMemory(
@@ skipping 140 matching lines @@
       notification_surface_manager_->GetSurface(notification_id)) {
     DLOG(ERROR) << "Invalid notification id, id=" << notification_id;
     return nullptr;
   }
 
   return base::MakeUnique<NotificationSurface>(notification_surface_manager_,
                                                surface, notification_id);
 }
 
 }  // namespace exo