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

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: Rebase 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
« no previous file with comments | « ash/system/chromeos/network/network_observer.h ('k') | ash/system/chromeos/network/tray_network.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..e1cef84b3f2e71a1105d6ecdba7d10b424fcc149 100644
--- a/ash/system/chromeos/network/network_state_notifier.cc
+++ b/ash/system/chromeos/network/network_state_notifier.cc
@@ -4,11 +4,9 @@
#include "ash/system/chromeos/network/network_state_notifier.h"
-#include "ash/ash_switches.h"
#include "ash/shell.h"
#include "ash/system/chromeos/network/network_observer.h"
#include "ash/system/tray/system_tray_notifier.h"
-#include "base/command_line.h"
#include "base/string16.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
@@ -173,10 +171,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 +205,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()->
« no previous file with comments | « ash/system/chromeos/network/network_observer.h ('k') | ash/system/chromeos/network/tray_network.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698