| Index: ash/system/chromeos/network/tray_vpn.cc
|
| diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc
|
| index 42e3536bb61d063a2ccccbe206e1f54ea0fabdcd..8f93b78893d5797970686b9ac58dd501fd7be68d 100644
|
| --- a/ash/system/chromeos/network/tray_vpn.cc
|
| +++ b/ash/system/chromeos/network/tray_vpn.cc
|
| @@ -22,18 +22,19 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| +using chromeos::NetworkState;
|
| +using chromeos::NetworkStateHandler;
|
| +
|
| namespace {
|
|
|
| bool UseNewNetworkHandlers() {
|
| - return CommandLine::ForCurrentProcess()->HasSwitch(
|
| - ash::switches::kAshEnableNewNetworkStatusArea);
|
| + return !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + ash::switches::kAshDisableNewNetworkStatusArea) &&
|
| + NetworkStateHandler::IsInitialized();
|
| }
|
|
|
| }
|
|
|
| -using chromeos::NetworkState;
|
| -using chromeos::NetworkStateHandler;
|
| -
|
| namespace ash {
|
| namespace internal {
|
|
|
|
|