| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_connect.h" | 5 #include "ash/system/chromeos/network/network_connect.h" |
| 6 | 6 |
| 7 #include "ash/session/session_state_delegate.h" | 7 #include "ash/session/session_state_delegate.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/system/chromeos/network/network_state_notifier.h" | 9 #include "ash/system/chromeos/network/network_state_notifier.h" |
| 10 #include "ash/system/system_notifier.h" | 10 #include "ash/system/system_notifier.h" |
| (...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 } | 560 } |
| 561 if (error == shill::kErrorEapRemoteTlsFailed) { | 561 if (error == shill::kErrorEapRemoteTlsFailed) { |
| 562 return l10n_util::GetStringUTF16( | 562 return l10n_util::GetStringUTF16( |
| 563 IDS_CHROMEOS_NETWORK_ERROR_EAP_REMOTE_TLS_FAILED); | 563 IDS_CHROMEOS_NETWORK_ERROR_EAP_REMOTE_TLS_FAILED); |
| 564 } | 564 } |
| 565 if (error == shill::kErrorPppAuthFailed) { | 565 if (error == shill::kErrorPppAuthFailed) { |
| 566 return l10n_util::GetStringUTF16( | 566 return l10n_util::GetStringUTF16( |
| 567 IDS_CHROMEOS_NETWORK_ERROR_PPP_AUTH_FAILED); | 567 IDS_CHROMEOS_NETWORK_ERROR_PPP_AUTH_FAILED); |
| 568 } | 568 } |
| 569 | 569 |
| 570 if (StringToLowerASCII(error) == | 570 if (base::StringToLowerASCII(error) == |
| 571 StringToLowerASCII(std::string(shill::kUnknownString))) { | 571 base::StringToLowerASCII(std::string(shill::kUnknownString))) { |
| 572 return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN); | 572 return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN); |
| 573 } | 573 } |
| 574 return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR, | 574 return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR, |
| 575 base::UTF8ToUTF16(error)); | 575 base::UTF8ToUTF16(error)); |
| 576 } | 576 } |
| 577 | 577 |
| 578 void ShowNetworkSettings(const std::string& service_path) { | 578 void ShowNetworkSettings(const std::string& service_path) { |
| 579 if (!ash::Shell::HasInstance()) | 579 if (!ash::Shell::HasInstance()) |
| 580 return; | 580 return; |
| 581 ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings( | 581 ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings( |
| 582 service_path); | 582 service_path); |
| 583 } | 583 } |
| 584 | 584 |
| 585 } // network_connect | 585 } // network_connect |
| 586 } // ash | 586 } // ash |
| OLD | NEW |