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

Unified Diff: ash/system/chromeos/network/tray_network.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_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 {

Powered by Google App Engine
This is Rietveld 408576698