Provide Shill Error to failure notification

ash/system/chromeos/network/network_state_notifier.h

 // 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.
 
 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_
 #define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_
 
 #include <set>
 
 #include "ash/ash_export.h"
@@ skipping 28 matching lines @@
   virtual ~NetworkStateNotifier();
 
   // NetworkStateHandlerObserver
   virtual void DefaultNetworkChanged(
       const chromeos::NetworkState* network) OVERRIDE;
   virtual void NetworkPropertiesUpdated(
       const chromeos::NetworkState* network) OVERRIDE;
 
   // Show a connection error notification. If |error_name| matches an error
   // defined in NetworkConnectionHandler for connect, configure, or activation
-  // failed, then the associated message is shown, otherwise the Shill
-  // error for Service.Error is used (from network_connect::ErrorString), or
-  // "Unknown network error".
+  // failed, then the associated message is shown, otherwise |shill_error|
+  // is expected to contain Service.Error (which might get cleared before
+  // GetProperties returns).
   void ShowNetworkConnectError(const std::string& error_name,
+                               const std::string& shill_error,
                                const std::string& service_path);
 
  private:
   void ConnectErrorPropertiesSucceeded(
       const std::string& error_name,
+      const std::string& shill_error,
       const std::string& service_path,
       const base::DictionaryValue& shill_properties);
   void ConnectErrorPropertiesFailed(
       const std::string& error_name,
+      const std::string& shill_error,
       const std::string& service_path,
-      const std::string& shill_error_name,
+      const std::string& shill_connect_error,
       scoped_ptr<base::DictionaryValue> shill_error_data);
   void ShowConnectErrorNotification(
       const std::string& error_name,
+      const std::string& shill_error,
       const std::string& service_path,
       const base::DictionaryValue& shill_properties);
 
   // Returns true if the default network changed.
   bool UpdateDefaultNetwork(const chromeos::NetworkState* network);
 
   // Helper methods to update state and check for notifications.
   void UpdateCellularOutOfCredits(const chromeos::NetworkState* cellular);
   void UpdateCellularActivating(const chromeos::NetworkState* cellular);
 
   std::string last_default_network_;
   bool did_show_out_of_credits_;
   base::Time out_of_credits_notify_time_;
   std::set<std::string> cellular_activating_;
   base::WeakPtrFactory<NetworkStateNotifier> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifier);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_