| Index: ash/mus/window_manager_application.cc
|
| diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
|
| index 12f597ee011daa976b2aca6d5dd22135883b9a1a..a4ba7e5524afceacd0e431d57b9f39851eaf79a2 100644
|
| --- a/ash/mus/window_manager_application.cc
|
| +++ b/ash/mus/window_manager_application.cc
|
| @@ -33,10 +33,10 @@
|
| #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_connect.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 {
|
| @@ -110,7 +110,7 @@ void WindowManagerApplication::InitializeComponents() {
|
| chromeos::DBusThreadManager::Get()->IsUsingFakes());
|
| chromeos::NetworkHandler::Initialize();
|
| network_connect_delegate_.reset(new NetworkConnectDelegateMus());
|
| - ui::NetworkConnect::Initialize(network_connect_delegate_.get());
|
| + chromeos::NetworkConnect::Initialize(network_connect_delegate_.get());
|
| // TODO(jamescook): Initialize real audio handler.
|
| chromeos::CrasAudioHandler::InitializeForTesting();
|
| PowerStatus::Initialize();
|
| @@ -121,7 +121,7 @@ void WindowManagerApplication::ShutdownComponents() {
|
| #if defined(OS_CHROMEOS)
|
| PowerStatus::Shutdown();
|
| chromeos::CrasAudioHandler::Shutdown();
|
| - ui::NetworkConnect::Shutdown();
|
| + chromeos::NetworkConnect::Shutdown();
|
| network_connect_delegate_.reset();
|
| chromeos::NetworkHandler::Shutdown();
|
| bluez::BluezDBusManager::Shutdown();
|
|
|