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 16 matching lines @@
         login_button_2_(
             new views::LabelButton(this, base::ASCIIToUTF16("Jimothy"))) {
     set_background(views::Background::CreateSolidBackground(SK_ColorRED));
     login_button_1_->SetStyle(views::Button::STYLE_BUTTON);
     login_button_2_->SetStyle(views::Button::STYLE_BUTTON);
     AddChildView(login_button_1_);
     AddChildView(login_button_2_);
   }
   ~UI() override {
     // Prevent the window manager from restarting during graceful shutdown.
-    window_manager_connection_->SetConnectionLostClosure(base::Closure());
+    mash_wm_connection_->SetConnectionLostClosure(base::Closure());
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   // Overridden from views::WidgetDelegate:
   views::View* GetContentsView() override { return this; }
   base::string16 GetWindowTitle() const override {
     // TODO(beng): use resources.
     return base::ASCIIToUTF16("Login");
   }
   void DeleteDelegate() override { delete this; }
@@ skipping 14 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() {
-    window_manager_connection_ = connector_->Connect("mojo:desktop_wm");
-    window_manager_connection_->SetConnectionLostClosure(
-        base::Bind(&UI::StartWindowManager, base::Unretained(this)));
+  void StartWindowManager(const shell::Identity& identity) {
+    mash_wm_connection_ = connector_->Connect("mojo:desktop_wm");
+    mash_wm_connection_->SetConnectionLostClosure(
+        base::Bind(&UI::StartWindowManager, base::Unretained(this), identity));
+    window_manager_connection_ =
+        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<shell::Connection> mash_wm_connection_;
+  std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(UI);
 };
 
 class Login : public shell::ShellClient,
               public shell::InterfaceFactory<mojom::Login>,
               public mojom::Login {
  public:
    Login() {}
   ~Login() override {}
@@ skipping 35 matching lines @@
   void SwitchUser() override { UI::Show(connector_, identity_, this); }
 
   void StartWindowManager();
 
   shell::Connector* connector_;
   shell::Identity identity_;
   mojo::TracingImpl tracing_;
   std::unique_ptr<views::AuraInit> aura_init_;
   mojo::BindingSet<mojom::Login> bindings_;
   mus::mojom::UserAccessManagerPtr user_access_manager_;
-  std::unique_ptr<shell::Connection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(Login);
 };
 
 void UI::ButtonPressed(views::Button* sender, const ui::Event& event) {
   // Login...
   if (sender == login_button_1_) {
     login_->LoginAs(user_id_1_);
   } else if (sender == login_button_2_) {
     login_->LoginAs(user_id_2_);
   } else {
     NOTREACHED();
   }
   GetWidget()->Close();
 }
 
 }  // namespace
 
 shell::ShellClient* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main