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 "ui/chromeos/network/network_connect.h" | 5 #include "ui/chromeos/network/network_connect.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
602 } | 602 } |
603 if (error == shill::kErrorEapRemoteTlsFailed) { | 603 if (error == shill::kErrorEapRemoteTlsFailed) { |
604 return l10n_util::GetStringUTF16( | 604 return l10n_util::GetStringUTF16( |
605 IDS_CHROMEOS_NETWORK_ERROR_EAP_REMOTE_TLS_FAILED); | 605 IDS_CHROMEOS_NETWORK_ERROR_EAP_REMOTE_TLS_FAILED); |
606 } | 606 } |
607 if (error == shill::kErrorPppAuthFailed) { | 607 if (error == shill::kErrorPppAuthFailed) { |
608 return l10n_util::GetStringUTF16( | 608 return l10n_util::GetStringUTF16( |
609 IDS_CHROMEOS_NETWORK_ERROR_PPP_AUTH_FAILED); | 609 IDS_CHROMEOS_NETWORK_ERROR_PPP_AUTH_FAILED); |
610 } | 610 } |
611 | 611 |
612 if (base::StringToLowerASCII(error) == | 612 if (base::ToLowerASCII(error) == base::ToLowerASCII(shill::kUnknownString)) { |
613 base::StringToLowerASCII(std::string(shill::kUnknownString))) { | |
614 return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN); | 613 return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN); |
615 } | 614 } |
616 return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR, | 615 return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR, |
617 base::UTF8ToUTF16(error)); | 616 base::UTF8ToUTF16(error)); |
618 } | 617 } |
619 | 618 |
620 void NetworkConnectImpl::ShowNetworkSettingsForPath( | 619 void NetworkConnectImpl::ShowNetworkSettingsForPath( |
621 const std::string& service_path) { | 620 const std::string& service_path) { |
622 const NetworkState* network = GetNetworkState(service_path); | 621 const NetworkState* network = GetNetworkState(service_path); |
623 delegate_->ShowNetworkSettingsForGuid(network ? network->guid() : ""); | 622 delegate_->ShowNetworkSettingsForGuid(network ? network->guid() : ""); |
(...skipping 24 matching lines...) Expand all Loading... |
648 return g_network_connect; | 647 return g_network_connect; |
649 } | 648 } |
650 | 649 |
651 NetworkConnect::NetworkConnect() { | 650 NetworkConnect::NetworkConnect() { |
652 } | 651 } |
653 | 652 |
654 NetworkConnect::~NetworkConnect() { | 653 NetworkConnect::~NetworkConnect() { |
655 } | 654 } |
656 | 655 |
657 } // namespace ui | 656 } // namespace ui |
OLD | NEW |