Revert of services/ui: Revert CLs that broke Windows.

ash/mus/non_client_frame_controller.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 "ash/mus/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
@@ skipping 94 matching lines @@
   void UpdateWindowTitle() override {}
   void SizeConstraintsChanged() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyDraggableNonClientFrameView);
 };
 
 class WmNativeWidgetMus : public views::NativeWidgetMus {
  public:
   WmNativeWidgetMus(views::internal::NativeWidgetDelegate* delegate,
-                    shell::Connector* connector,
                     ui::Window* window,
                     ui::WindowManagerClient* window_manager_client)
-      : NativeWidgetMus(delegate,
-                        connector,
-                        window,
-                        ui::mojom::SurfaceType::UNDERLAY),
+      : NativeWidgetMus(delegate, window, ui::mojom::SurfaceType::UNDERLAY),
         window_manager_client_(window_manager_client) {}
   ~WmNativeWidgetMus() override {}
 
   // NativeWidgetMus:
   views::NonClientFrameView* CreateNonClientFrameView() override {
     move_event_handler_.reset(new MoveEventHandler(
         window(), window_manager_client_, GetNativeView()));
     if (ShouldRemoveStandardFrame(window()))
       return new EmptyDraggableNonClientFrameView();
     return new NonClientFrameViewMash(GetWidget(), window());
@@ skipping 99 matching lines @@
 
   // To simplify things this code creates a Widget. While a Widget is created
   // we need to ensure we don't inadvertently change random properties of the
   // underlying ui::Window. For example, showing the Widget shouldn't change
   // the bounds of the ui::Window in anyway.
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   // We initiate focus at the mus level, not at the views level.
   params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   params.delegate = this;
   params.native_widget =
-      new WmNativeWidgetMus(widget_, connector, window, window_manager_client);
+      new WmNativeWidgetMus(widget_, window, window_manager_client);
   widget_->Init(params);
 
   parent->AddChild(window);
 
   widget_->ShowInactive();
 
   const int shadow_inset =
       Shadow::GetInteriorInsetForStyle(Shadow::STYLE_ACTIVE);
   const gfx::Insets extended_hit_region =
       wm_window->ShouldUseExtendedHitRegion()
@@ skipping 76 matching lines @@
   }
 }
 
 void NonClientFrameController::OnWindowDestroyed(ui::Window* window) {
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace mus
 }  // namespace ash