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

Side by Side Diff: ash/system/chromeos/network/network_state_notifier.cc

Issue 16512003: Configure networks requiring a certificate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add localized Auth error messages Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/chromeos/network/network_state_notifier.h" 5 #include "ash/system/chromeos/network/network_state_notifier.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/chromeos/network/network_observer.h" 8 #include "ash/system/chromeos/network/network_observer.h"
9 #include "ash/system/tray/system_tray_notifier.h" 9 #include "ash/system/tray/system_tray_notifier.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 IDS_CHROMEOS_NETWORK_ERROR_IPSEC_PSK_AUTH_FAILED); 81 IDS_CHROMEOS_NETWORK_ERROR_IPSEC_PSK_AUTH_FAILED);
82 } 82 }
83 if (error == flimflam::kErrorIpsecCertAuthFailed) { 83 if (error == flimflam::kErrorIpsecCertAuthFailed) {
84 return l10n_util::GetStringUTF16( 84 return l10n_util::GetStringUTF16(
85 IDS_CHROMEOS_NETWORK_ERROR_IPSEC_CERT_AUTH_FAILED); 85 IDS_CHROMEOS_NETWORK_ERROR_IPSEC_CERT_AUTH_FAILED);
86 } 86 }
87 if (error == flimflam::kErrorPppAuthFailed) { 87 if (error == flimflam::kErrorPppAuthFailed) {
88 return l10n_util::GetStringUTF16( 88 return l10n_util::GetStringUTF16(
89 IDS_CHROMEOS_NETWORK_ERROR_PPP_AUTH_FAILED); 89 IDS_CHROMEOS_NETWORK_ERROR_PPP_AUTH_FAILED);
90 } 90 }
91 if (error == shill::kErrorEapAuthenticationFailed ||
92 error == shill::kErrorEapLocalTlsFailed ||
93 error == shill::kErrorEapRemoteTlsFailed) {
94 return l10n_util::GetStringUTF16(
95 IDS_CHROMEOS_NETWORK_ERROR_IPSEC_CERT_AUTH_FAILED);
pneubeck (no reviews) 2013/06/06 20:41:20 These errors are not related to IPsec only. Curren
stevenjb 2013/06/07 03:44:58 The message is "Failed to authenticate with provid
pneubeck (no reviews) 2013/06/07 12:05:47 Could be put into a follow-up CL: Looking at the
96 }
97
91 if (StringToLowerASCII(error) == 98 if (StringToLowerASCII(error) ==
92 StringToLowerASCII(std::string(flimflam::kUnknownString))) { 99 StringToLowerASCII(std::string(flimflam::kUnknownString))) {
93 return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN); 100 return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN);
94 } 101 }
95 return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR, 102 return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR,
96 UTF8ToUTF16(error)); 103 UTF8ToUTF16(error));
97 } 104 }
98 105
99 } // namespace 106 } // namespace
100 107
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 VLOG(2) << " Network: " << network->path(); 253 VLOG(2) << " Network: " << network->path();
247 cached_state_[network->path()] = network->connection_state(); 254 cached_state_[network->path()] = network->connection_state();
248 } 255 }
249 const NetworkState* default_network = 256 const NetworkState* default_network =
250 NetworkHandler::Get()->network_state_handler()->DefaultNetwork(); 257 NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
251 if (default_network && default_network->IsConnectedState()) 258 if (default_network && default_network->IsConnectedState())
252 last_active_network_ = default_network->path(); 259 last_active_network_ = default_network->path();
253 } 260 }
254 261
255 } // namespace ash 262 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698