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

ash/sysui/sysui_application.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 "ash/sysui/sysui_application.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 182 matching lines @@
 
   ~AshInit() { worker_pool_->Shutdown(); }
 
   aura::Window* root() { return ash::Shell::GetPrimaryRootWindow(); }
 
   void Initialize(::shell::Connector* connector,
                   const ::shell::Identity& identity) {
     InitializeResourceBundle(connector);
     aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
     ash::MaterialDesignController::Initialize();
-    views::WindowManagerConnection::Create(connector, identity);
+    views_mus_ = views::WindowManagerConnection::Create(connector, identity);
 
     display::Screen* screen = display::Screen::GetScreen();
     DCHECK(screen);
     gfx::Size size = screen->GetPrimaryDisplay().bounds().size();
 
     // Uninstall the ScreenMus installed by WindowManagerConnection, so that ash
     // installs and uses the ScreenAsh. This can be removed once ash learns to
     // talk to mus for managing displays.
     // TODO(mfomitchev): We need to fix this. http://crbug.com/607300
     display::Screen::SetScreenInstance(nullptr);
@@ skipping 82 matching lines @@
             chromeos::DBusClientBundle::BLUETOOTH));
     chromeos::CrasAudioHandler::InitializeForTesting();
 #endif
   }
 
  private:
   scoped_refptr<base::SequencedWorkerPool> worker_pool_;
   std::unique_ptr<views::AuraInit> aura_init_;
   ShellDelegateMus* ash_delegate_ = nullptr;
   std::unique_ptr<NativeWidgetFactory> native_widget_factory_;
+  std::unique_ptr<views::WindowManagerConnection> views_mus_;

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

views_mus_->window_manager_connection_

[sadrul, 2016/05/31 20:02:44]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(AshInit);
 };
 
 SysUIApplication::SysUIApplication() {}
 
 SysUIApplication::~SysUIApplication() {}
 
 void SysUIApplication::Initialize(::shell::Connector* connector,
                                   const ::shell::Identity& identity,
@@ skipping 10 matching lines @@
 void SysUIApplication::Create(
     ::shell::Connection* connection,
     mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) {
   mash::shelf::mojom::ShelfController* shelf_controller =
       static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate());
   shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
 }
 
 }  // namespace sysui
 }  // namespace ash