Merge 220596 "Differentiate between 'connect-failed' and 'bad-pa..."

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/shell.h"
 #include "ash/system/chromeos/network/network_connect.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ skipping 17 matching lines @@
 
 const int kMinTimeBetweenOutOfCreditsNotifySeconds = 10 * 60;
 
 // Error messages based on |error_name|, not network_state->error().
 string16 GetConnectErrorString(const std::string& error_name) {
   if (error_name == NetworkConnectionHandler::kErrorNotFound)
     return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_CONNECT_FAILED);
   if (error_name == NetworkConnectionHandler::kErrorConfigureFailed)
     return l10n_util::GetStringUTF16(
         IDS_CHROMEOS_NETWORK_ERROR_CONFIGURE_FAILED);
-  if (error_name == NetworkConnectionHandler::kErrorActivateFailed)
+  if (error_name == ash::network_connect::kErrorActivateFailed)
     return l10n_util::GetStringUTF16(
         IDS_CHROMEOS_NETWORK_ERROR_ACTIVATION_FAILED);
   return string16();
 }
 
 }  // namespace
 
 namespace ash {
 
 NetworkStateNotifier::NetworkStateNotifier()
@@ skipping 15 matching lines @@
   NetworkHandler::Get()->network_state_handler()->RemoveObserver(
       this, FROM_HERE);
 }
 
 void NetworkStateNotifier::NetworkListChanged() {
   // Trigger any pending connect failed error if the network list changes
   // (which indicates all NetworkState entries are up to date). This is in
   // case a connect attempt fails because a network is no longer visible.
   if (!connect_failed_network_.empty()) {
     ShowNetworkConnectError(
-        NetworkConnectionHandler::kErrorConnectFailed, connect_failed_network_);
+        flimflam::kErrorConnectFailed, connect_failed_network_);
   }
 }
 
 void NetworkStateNotifier::DefaultNetworkChanged(const NetworkState* network) {
   if (!network || !network->IsConnectedState())
     return;
   if (network->path() != last_active_network_) {
     last_active_network_ = network->path();
     // Reset state for new connected network
     cellular_out_of_credits_ = false;
   }
 }
 
 void NetworkStateNotifier::NetworkPropertiesUpdated(
     const NetworkState* network) {
   DCHECK(network);
   // Trigger a pending connect failed error for |network| when the Error
   // property has been set.
   if (network->path() == connect_failed_network_ && !network->error().empty()) {
     ShowNetworkConnectError(
-        NetworkConnectionHandler::kErrorConnectFailed, connect_failed_network_);
+        flimflam::kErrorConnectFailed, connect_failed_network_);
   }
   // 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_;
@@ skipping 28 matching lines @@
     ash::Shell::GetInstance()->system_tray_notifier()->
         NotifyClearNetworkMessage(message_type);
   }
 }
 
 void NetworkStateNotifier::ShowNetworkConnectError(
     const std::string& error_name,
     const std::string& service_path) {
   const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
       GetNetworkState(service_path);
-  if (error_name == NetworkConnectionHandler::kErrorConnectFailed &&
+  if (error_name == flimflam::kErrorConnectFailed &&
       service_path != connect_failed_network_) {
     // Shill may not have set the Error property yet. First request an update
     // and wait for either the update to complete or the network list to be
     // updated before displaying the error.
     connect_failed_network_ = service_path;
     return;
   }
   connect_failed_network_.clear();
 
   string16 error = GetConnectErrorString(error_name);
@@ skipping 20 matching lines @@
   ash::Shell::GetInstance()->system_tray_notifier()->NotifySetNetworkMessage(
       this,
       NetworkObserver::ERROR_CONNECT_FAILED,
       NetworkObserver::GetNetworkTypeForNetworkState(network),
       l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE),
       error_msg,
       no_links);
 }
 
 }  // namespace ash