| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 078305c1aa975002e71d86a51d845b9946b73918..c07a102cf5fa74e94114f80bb886b037f9cc2d62 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -101,6 +101,7 @@
|
| #include "base/chromeos/chromeos_version.h"
|
| #include "base/message_pump_aurax11.h"
|
| #include "chromeos/display/output_configurator.h"
|
| +#include "chromeos/network/network_state_handler.h"
|
| #include "content/public/browser/gpu_data_manager.h"
|
| #include "content/public/common/gpu_feature_type.h"
|
| #endif // defined(OS_CHROMEOS)
|
| @@ -221,6 +222,11 @@ Shell::Shell(ShellDelegate* delegate)
|
| output_configurator_->AddObserver(output_configurator_animation_.get());
|
| base::MessagePumpAuraX11::Current()->AddDispatcherForRootWindow(
|
| output_configurator());
|
| + if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshEnableNetworkStateHandler)) {
|
| + network_state_handler_.reset(new chromeos::NetworkStateHandler());
|
| + network_state_handler_->Init();
|
| + }
|
| #endif // defined(OS_CHROMEOS)
|
| }
|
|
|
|
|