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

mash/login/login.cc

 // Copyright 2016 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 "mash/login/login.h"
 
 #include <map>
 #include <memory>
 
 #include "ash/public/interfaces/container.mojom.h"
@@ skipping 36 matching lines @@
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.delegate = ui;
 
     std::map<std::string, std::vector<uint8_t>> properties;
     properties[ash::mojom::kWindowContainer_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             static_cast<int32_t>(ash::mojom::Container::LOGIN_WINDOWS));
     ui::Window* window =
         views::WindowManagerConnection::Get()->NewWindow(properties);
     params.native_widget = new views::NativeWidgetMus(
-        widget, connector, window, ui::mojom::SurfaceType::DEFAULT);
+        widget, window, ui::mojom::SurfaceType::DEFAULT);
     widget->Init(params);
     widget->Show();
   }
 
  private:
   UI(Login* login, shell::Connector* connector)
       : login_(login),
         connector_(connector),
         user_id_1_("00000000-0000-4000-8000-000000000000"),
         user_id_2_("00000000-0000-4000-8000-000000000001"),
@@ skipping 133 matching lines @@
 }
 
 }  // namespace
 
 shell::Service* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main