mustash: Fix crash when clicking on network in system tray

ash/mus/window_manager_application.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/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/mojo_interface_factory.h"
@@ skipping 18 matching lines @@
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/surface_context_factory.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/system/fake_statistics_provider.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"  // nogncheck
+#include "ui/chromeos/network/network_connect.h"
 #endif
 
 namespace ash {
 namespace mus {
-namespace {
 
-void InitializeComponents() {
-  message_center::MessageCenter::Initialize();
 #if defined(OS_CHROMEOS)
-  // Must occur after mojo::ApplicationRunner has initialized AtExitManager, but
-  // before WindowManager::Init().
-  chromeos::DBusThreadManager::Initialize(
-      chromeos::DBusThreadManager::PROCESS_ASH);
+// TODO(mash): Replace ui::NetworkConnect::Delegate with a mojo interface on a
+// NetworkConfig service.

[msw, 2016/10/04 22:50:45]

nit: cite a bug?

+class WindowManagerApplication::StubNetworkConnectDelegate
+    : public ui::NetworkConnect::Delegate {
+ public:
+  StubNetworkConnectDelegate() {}
+  ~StubNetworkConnectDelegate() override {}
 
-  // See ChromeBrowserMainPartsChromeos for ordering details.
-  bluez::BluezDBusManager::Initialize(
-      chromeos::DBusThreadManager::Get()->GetSystemBus(),
-      chromeos::DBusThreadManager::Get()->IsUsingFakes());
-  chromeos::NetworkHandler::Initialize();
-  // TODO(jamescook): Initialize real audio handler.
-  chromeos::CrasAudioHandler::InitializeForTesting();
-  PowerStatus::Initialize();
-#endif
-}
+  void ShowNetworkConfigure(const std::string& network_id) override {}
+  void ShowNetworkSettingsForGuid(const std::string& network_id) override {}
+  bool ShowEnrollNetwork(const std::string& network_id) override {
+    return false;
+  }
+  void ShowMobileSimDialog() override {}
+  void ShowMobileSetupDialog(const std::string& service_path) override {}
 
-void ShutdownComponents() {
-#if defined(OS_CHROMEOS)
-  PowerStatus::Shutdown();
-  chromeos::CrasAudioHandler::Shutdown();
-  chromeos::NetworkHandler::Shutdown();
-  bluez::BluezDBusManager::Shutdown();
-  chromeos::DBusThreadManager::Shutdown();
-#endif
-  message_center::MessageCenter::Shutdown();
-}
-
-}  // namespace
+ private:
+  DISALLOW_COPY_AND_ASSIGN(StubNetworkConnectDelegate);
+};
+#endif  // OS_CHROMEOS
 
 WindowManagerApplication::WindowManagerApplication()
     : screenlock_state_listener_binding_(this) {}
 
 WindowManagerApplication::~WindowManagerApplication() {
   // AcceleratorRegistrarImpl removes an observer in its destructor. Destroy
   // it early on.
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars(
       accelerator_registrars_);
   for (AcceleratorRegistrarImpl* registrar : accelerator_registrars)
@@ skipping 35 matching lines @@
   statistics_provider_.reset(
       new chromeos::system::ScopedFakeStatisticsProvider());
   statistics_provider_->SetMachineStatistic("initial_locale", "en-US");
   statistics_provider_->SetMachineStatistic("keyboard_layout", "");
 #endif
   window_manager_->Init(std::move(window_tree_client), blocking_pool);
   native_widget_factory_mus_ =
       base::MakeUnique<NativeWidgetFactoryMus>(window_manager_.get());
 }
 
+void WindowManagerApplication::InitializeComponents() {

[msw, 2016/10/04 22:50:45]

aside: too bad these have to become class members, but oh well.

+  message_center::MessageCenter::Initialize();
+#if defined(OS_CHROMEOS)
+  // Must occur after mojo::ApplicationRunner has initialized AtExitManager, but
+  // before WindowManager::Init().
+  chromeos::DBusThreadManager::Initialize(
+      chromeos::DBusThreadManager::PROCESS_ASH);
+
+  // See ChromeBrowserMainPartsChromeos for ordering details.
+  bluez::BluezDBusManager::Initialize(
+      chromeos::DBusThreadManager::Get()->GetSystemBus(),
+      chromeos::DBusThreadManager::Get()->IsUsingFakes());
+  chromeos::NetworkHandler::Initialize();
+  network_connect_delegate_.reset(new StubNetworkConnectDelegate());
+  ui::NetworkConnect::Initialize(network_connect_delegate_.get());
+  // TODO(jamescook): Initialize real audio handler.
+  chromeos::CrasAudioHandler::InitializeForTesting();
+  PowerStatus::Initialize();
+#endif
+}
+
+void WindowManagerApplication::ShutdownComponents() {
+#if defined(OS_CHROMEOS)
+  PowerStatus::Shutdown();
+  chromeos::CrasAudioHandler::Shutdown();
+  ui::NetworkConnect::Shutdown();
+  network_connect_delegate_.reset();

[msw, 2016/10/04 22:50:45]

It's a bit odd that the window manager application would own a
NetworkConnect::Delegate, but I guess it's just temporary until your TODO above
is addressed.

+  chromeos::NetworkHandler::Shutdown();
+  bluez::BluezDBusManager::Shutdown();
+  chromeos::DBusThreadManager::Shutdown();
+#endif
+  message_center::MessageCenter::Shutdown();
+}
+
 void WindowManagerApplication::OnStart(const shell::Identity& identity) {
   aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak",
                                        "ash_mus_resources_200.pak"));
   gpu_service_ = ui::GpuService::Create(connector());
   compositor_context_factory_.reset(
       new views::SurfaceContextFactory(gpu_service_.get()));
   aura::Env::GetInstance()->set_context_factory(
       compositor_context_factory_.get());
   window_manager_.reset(new WindowManager(connector()));
 
@@ skipping 66 matching lines @@
       base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
                  base::Unretained(this))));
 }
 
 void WindowManagerApplication::ScreenlockStateChanged(bool locked) {
   window_manager_->SetScreenLocked(locked);
 }
 
 }  // namespace mus
 }  // namespace ash