views/mus: Have explicit ownership of views::WindowManagerConnection.

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 "base/guid.h"
@@ skipping 22 matching lines @@
 
 class Login;
 
 class UI : public views::WidgetDelegateView,
            public views::ButtonListener {
  public:
   static void Show(shell::Connector* connector,
                    const shell::Identity& identity,
                    Login* login) {
     UI* ui = new UI(login, connector);
-    ui->StartWindowManager();
-
-    views::WindowManagerConnection::Create(connector, identity);
+    ui->StartWindowManager(identity);
 
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.delegate = ui;
 
     std::map<std::string, std::vector<uint8_t>> properties;
     properties[mash::wm::mojom::kWindowContainer_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             static_cast<int32_t>(mash::wm::mojom::Container::LOGIN_WINDOWS));
@@ skipping 51 matching lines @@
 
     login_button_1_->SetBounds(button_box.x(), button_box.y(), ps1.width(),
                                 ps1.height());
     login_button_2_->SetBounds(login_button_1_->bounds().right() + 10,
                                 button_box.y(), ps2.width(), ps2.height());
   }
 
   // Overridden from views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  void StartWindowManager() {
+  void StartWindowManager(const shell::Identity& identity) {
     window_manager_connection_ = connector_->Connect("mojo:desktop_wm");
     window_manager_connection_->SetConnectionLostClosure(
-        base::Bind(&UI::StartWindowManager, base::Unretained(this)));
+        base::Bind(&UI::StartWindowManager, base::Unretained(this), identity));
+    views_mus_ = views::WindowManagerConnection::Create(connector_, identity);
   }
 
   Login* login_;
   shell::Connector* connector_;
   const std::string user_id_1_;
   const std::string user_id_2_;
   views::LabelButton* login_button_1_;
   views::LabelButton* login_button_2_;
   std::unique_ptr<shell::Connection> window_manager_connection_;
+  std::unique_ptr<views::WindowManagerConnection> views_mus_;

[sky, 2016/05/31 18:57:24]

mooorrrr

 
   DISALLOW_COPY_AND_ASSIGN(UI);
 };
 
 class Login : public shell::ShellClient,
               public shell::InterfaceFactory<mojom::Login>,
               public mojom::Login {
  public:
    Login() {}
   ~Login() override {}
@@ skipping 60 matching lines @@
 }
 
 }  // namespace
 
 shell::ShellClient* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main