chromeos: Refactor system tray Wi-Fi connect dialog so it works with mash

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 12 matching lines @@
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/events/event.h"
 #include "ui/message_center/message_center.h"
 #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 "ash/mus/network_connect_delegate_mus.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 {
 
-#if defined(OS_CHROMEOS)
-// TODO(mash): Replace ui::NetworkConnect::Delegate with a mojo interface on a
-// NetworkConfig service. http://crbug.com/644355
-class WindowManagerApplication::StubNetworkConnectDelegate
-    : public ui::NetworkConnect::Delegate {
- public:
-  StubNetworkConnectDelegate() {}
-  ~StubNetworkConnectDelegate() override {}
-
-  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 {}
-
- 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)
     registrar->Destroy();
@@ skipping 47 matching lines @@
   // 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());
+  network_connect_delegate_.reset(new NetworkConnectDelegateMus());
   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();
@@ skipping 77 matching lines @@
       base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
                  base::Unretained(this))));
 }
 
 void WindowManagerApplication::ScreenlockStateChanged(bool locked) {
   window_manager_->SetScreenLocked(locked);
 }
 
 }  // namespace mus
 }  // namespace ash