Revert of ash/mash: Add a mus-client that sets up ash to provide the system ui for mash.

ui/views/mus/window_manager_connection.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 "ui/views/mus/window_manager_connection.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
@@ skipping 36 matching lines @@
 void WindowManagerConnection::Reset() {
   delete Get();
   lazy_tls_ptr.Pointer()->Set(nullptr);
 }
 
 mus::Window* WindowManagerConnection::NewWindow(
     const std::map<std::string, std::vector<uint8_t>>& properties) {
   return window_tree_connection_->NewTopLevelWindow(&properties);
 }
 
-NativeWidget* WindowManagerConnection::CreateNativeWidgetMus(
-    const Widget::InitParams& init_params,
-    internal::NativeWidgetDelegate* delegate) {
-  std::map<std::string, std::vector<uint8_t>> properties;
-  NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties);
-  return new NativeWidgetMus(delegate, shell_, NewWindow(properties),
-                             mus::mojom::SurfaceType::DEFAULT);
-}
-
 WindowManagerConnection::WindowManagerConnection(mojo::Shell* shell)
     : shell_(shell), window_tree_connection_(nullptr) {
   window_tree_connection_.reset(
       mus::WindowTreeConnection::Create(this, shell_));
 
   screen_.reset(new ScreenMus(this));
   screen_->Init(shell);
 
-  ViewsDelegate::GetInstance()->set_native_widget_factory(base::Bind(
-      &WindowManagerConnection::CreateNativeWidgetMus, base::Unretained(this)));
+  ViewsDelegate::GetInstance()->set_native_widget_factory(
+      base::Bind(&WindowManagerConnection::CreateNativeWidget,
+                 base::Unretained(this)));
 }
 
 WindowManagerConnection::~WindowManagerConnection() {
   // ~WindowTreeConnection calls back to us (we're the WindowTreeDelegate),
   // destroy it while we are still valid.
   window_tree_connection_.reset();
 }
 
 void WindowManagerConnection::OnEmbed(mus::Window* root) {}
 
 void WindowManagerConnection::OnConnectionLost(
     mus::WindowTreeConnection* connection) {}
 
 void WindowManagerConnection::OnWindowManagerFrameValuesChanged() {
   if (window_tree_connection_)
     NativeWidgetMus::NotifyFrameChanged(window_tree_connection_.get());
 }
 
+NativeWidget* WindowManagerConnection::CreateNativeWidget(
+    const Widget::InitParams& init_params,
+    internal::NativeWidgetDelegate* delegate) {
+  std::map<std::string, std::vector<uint8_t>> properties;
+  NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties);
+  return new NativeWidgetMus(delegate, shell_, NewWindow(properties),
+                             mus::mojom::SurfaceType::DEFAULT);
+}
+
 }  // namespace views