exo: Run exo in mus+ash

chrome/browser/chrome_browser_main_extra_parts_exo.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 "chrome/browser/chrome_browser_main_extra_parts_exo.h"
 
 #include "base/memory/ptr_util.h"
 
 #if defined(USE_GLIB)
 #include <glib.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/exo/display.h"
 #include "components/exo/wayland/server.h"
+#include "components/exo/wm_helper_ash.h"
+#include "components/exo/wm_helper_mus.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/arc/notification/arc_notification_surface_manager.h"
 
 #if defined(USE_GLIB)
 namespace {
 
 struct GLibWaylandSource : public GSource {
   // Note: The GLibWaylandSource is created and destroyed by GLib. So its
   // constructor/destructor may or may not get called.
   exo::wayland::Server* server;
@@ skipping 73 matching lines @@
   void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
 
  private:
   base::MessagePumpLibevent::FileDescriptorWatcher controller_;
   exo::wayland::Server* const server_;
 
   DISALLOW_COPY_AND_ASSIGN(WaylandWatcher);
 };
 #endif
 
-ChromeBrowserMainExtraPartsExo::ChromeBrowserMainExtraPartsExo()
-    : arc_notification_surface_manager_(new arc::ArcNotificationSurfaceManager),
-      display_(new exo::Display(arc_notification_surface_manager_.get())) {}
+ChromeBrowserMainExtraPartsExo::ChromeBrowserMainExtraPartsExo() {}
 
 ChromeBrowserMainExtraPartsExo::~ChromeBrowserMainExtraPartsExo() {}
 
 void ChromeBrowserMainExtraPartsExo::PreProfileInit() {
-  if (!chrome::ShouldOpenAshOnStartup())
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableWaylandServer))
     return;
 
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableWaylandServer)) {
-    wayland_server_ = exo::wayland::Server::Create(display_.get());
-    wayland_watcher_ =
-        base::WrapUnique(new WaylandWatcher(wayland_server_.get()));
-  }
+  arc_notification_surface_manager_ =
+      base::MakeUnique<arc::ArcNotificationSurfaceManager>();
+  const bool using_mus = !chrome::ShouldOpenAshOnStartup();
+  if (using_mus)
+    wm_helper_ = base::MakeUnique<exo::WMHelperMus>();
+  else
+    wm_helper_ = base::MakeUnique<exo::WMHelperAsh>();
+  exo::WMHelper::SetInstance(wm_helper_.get());
+  display_ = base::MakeUnique<exo::Display>(
+      arc_notification_surface_manager_.get());
+  wayland_server_ = exo::wayland::Server::Create(display_.get());
+  wayland_watcher_ = base::MakeUnique<WaylandWatcher>(wayland_server_.get());
 }
 
 void ChromeBrowserMainExtraPartsExo::PostMainMessageLoopRun() {
   wayland_watcher_.reset();
   wayland_server_.reset();
+  exo::WMHelper::SetInstance(nullptr);
+  wm_helper_.reset();
 }