| Index: ash/system/chromeos/network/tray_network.cc
|
| diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
|
| index 895a0395f6e4482d02e72f5a2c6bca5ba5096004..9bde13d61bb67087de6fb591431a5719a52b2054 100644
|
| --- a/ash/system/chromeos/network/tray_network.cc
|
| +++ b/ash/system/chromeos/network/tray_network.cc
|
| @@ -32,6 +32,9 @@
|
| #include "ui/views/layout/box_layout.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| +using chromeos::NetworkState;
|
| +using chromeos::NetworkStateHandler;
|
| +
|
| namespace {
|
|
|
| using ash::internal::TrayNetwork;
|
| @@ -56,15 +59,13 @@ int GetMessageIcon(
|
| }
|
|
|
| bool UseNewNetworkHandlers() {
|
| - return CommandLine::ForCurrentProcess()->HasSwitch(
|
| - ash::switches::kAshEnableNewNetworkStatusArea);
|
| + return !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + ash::switches::kAshDisableNewNetworkStatusArea) &&
|
| + NetworkStateHandler::IsInitialized();
|
| }
|
|
|
| } // namespace
|
|
|
| -using chromeos::NetworkState;
|
| -using chromeos::NetworkStateHandler;
|
| -
|
| namespace ash {
|
| namespace internal {
|
|
|
|
|