diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 18:20:09 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 18:20:09 +0000 |
| commit | 9475ee6fd75dc742f21dba981ecc001901d5d1d7 (patch) | |
| tree | 6a445ee8f9a835da40b32a56e458dfb38f90013c /ash/system | |
| parent | 85be7fac463eff4d345e1dd0dccad751977467a3 (diff) | |
| download | chromium_src-9475ee6fd75dc742f21dba981ecc001901d5d1d7.zip chromium_src-9475ee6fd75dc742f21dba981ecc001901d5d1d7.tar.gz chromium_src-9475ee6fd75dc742f21dba981ecc001901d5d1d7.tar.bz2 | |
Enable ash new network status area by default
BUG=179504
For ash_switches:
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/12548014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/chromeos/network/tray_network.cc | 11 | ||||
| -rw-r--r-- | ash/system/chromeos/network/tray_vpn.cc | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc index 895a039..9bde13d 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 { diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc index 42e3536..8f93b7889 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 { |