Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1607)

Unified Diff: ash/system/chromeos/network/tray_vpn.cc

Issue 12548014: Enable ash new network status area by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests, ash_shell Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 {

Powered by Google App Engine
This is Rietveld 408576698