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

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

Issue 15350002: Deprecate kAshDisableNewNetworkStatusArea (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 7 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/network_state_notifier.cc
diff --git a/ash/system/chromeos/network/network_state_notifier.cc b/ash/system/chromeos/network/network_state_notifier.cc
index 1805143b1830003255a4676f22ba25b8b749d481..5eee3d1a0597955554506bc246f8457d0aad6a97 100644
--- a/ash/system/chromeos/network/network_state_notifier.cc
+++ b/ash/system/chromeos/network/network_state_notifier.cc
@@ -173,10 +173,6 @@ void NetworkStateNotifier::NetworkConnectionStateChanged(
void NetworkStateNotifier::NetworkPropertiesUpdated(
const NetworkState* network) {
DCHECK(network);
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- ash::switches::kAshDisableNewNetworkStatusArea)) {
- return;
- }
// Trigger "Out of credits" notification if the cellular network is the most
// recent default network (i.e. we have not switched to another network).
if (network->type() == flimflam::kTypeCellular &&
@@ -211,7 +207,7 @@ void NetworkStateNotifier::NotificationLinkClicked(
if (message_type == ash::NetworkObserver::ERROR_OUT_OF_CREDITS) {
if (!cellular_network_.empty()) {
// This will trigger the activation / portal code.
- Shell::GetInstance()->system_tray_delegate()->ConnectToNetwork(
+ Shell::GetInstance()->system_tray_delegate()->ConfigureNetwork(
cellular_network_);
}
ash::Shell::GetInstance()->system_tray_notifier()->

Powered by Google App Engine
This is Rietveld 408576698