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

ash/system/chromeos/network/network_connect.h

Index: ash/system/chromeos/network/network_connect.h
===================================================================
--- ash/system/chromeos/network/network_connect.h	(revision 221717)
+++ ash/system/chromeos/network/network_connect.h	(working copy)
@@ -18,6 +18,8 @@
 namespace ash {
 namespace network_connect {
 
+ASH_EXPORT extern const char kErrorActivateFailed[];
+
 // Requests a network connection and handles any errors and notifications.
 // |owning_window| is used to parent any UI on failure (e.g. for certificate
 // enrollment). If NULL, the default window will be used.
Property changes on: ash/system/chromeos/network/network_connect.h
___________________________________________________________________
Added: svn:eol-style
   + LF