Deprecate kAshDisableNewNetworkStatusArea

ash/system/chromeos/network/network_state_notifier.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
@@ skipping 155 matching lines @@
       l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE),
       l10n_util::GetStringFUTF16(
             IDS_NETWORK_CONNECTION_ERROR_MESSAGE_WITH_DETAILS,
             UTF8ToUTF16(network->name()), error),
       no_links);
 }
 
 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 &&
       network->path() == last_active_network_) {
     cellular_network_ = network->path();
     if (network->cellular_out_of_credits() &&
         !cellular_out_of_credits_) {
       cellular_out_of_credits_ = true;
       base::TimeDelta dtime = base::Time::Now() - out_of_credits_notify_time_;
       if (dtime.InSeconds() > kMinTimeBetweenOutOfCreditsNotifySeconds) {
@@ skipping 14 matching lines @@
     }
   }
 }
 
 void NetworkStateNotifier::NotificationLinkClicked(
     NetworkObserver::MessageType message_type,
     size_t link_index) {
   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()->
         NotifyClearNetworkMessage(message_type);
   }
 }
 
 void NetworkStateNotifier::InitializeNetworks() {
   NetworkStateList network_list;
   NetworkStateHandler::Get()->GetNetworkList(&network_list);
   VLOG(1) << "NetworkStateNotifier:InitializeNetworks: "
           << network_list.size();
   for (NetworkStateList::iterator iter = network_list.begin();
        iter != network_list.end(); ++iter) {
     const NetworkState* network = *iter;
     VLOG(2) << " Network: " << network->path();
     cached_state_[network->path()] = network->connection_state();
   }
   const NetworkState* default_network =
       NetworkStateHandler::Get()->DefaultNetwork();
   if (default_network && default_network->IsConnectedState())
     last_active_network_ = default_network->path();
 }
 
 }  // namespace internal
 }  // namespace ash