OLD | NEW |
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 "chrome/browser/chromeos/cros/network_library_impl_base.h" | 5 #include "chrome/browser/chromeos/cros/network_library_impl_base.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "chrome/browser/chromeos/cros/native_network_parser.h" | 8 #include "chrome/browser/chromeos/cros/native_network_parser.h" |
9 #include "chrome/browser/chromeos/cros/onc_network_parser.h" | 9 #include "chrome/browser/chromeos/cros/onc_network_parser.h" |
10 #include "chrome/browser/chromeos/network_login_observer.h" | 10 #include "chrome/browser/chromeos/network_login_observer.h" |
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
891 network->set_error(ERROR_CONNECT_FAILED); | 891 network->set_error(ERROR_CONNECT_FAILED); |
892 } | 892 } |
893 NotifyNetworkManagerChanged(true); // Forced update. | 893 NotifyNetworkManagerChanged(true); // Forced update. |
894 NotifyNetworkChanged(network); | 894 NotifyNetworkChanged(network); |
895 VLOG(1) << "Error connecting to network: " << network->name() | 895 VLOG(1) << "Error connecting to network: " << network->name() |
896 << " Status: " << status; | 896 << " Status: " << status; |
897 return; | 897 return; |
898 } | 898 } |
899 | 899 |
900 VLOG(1) << "Connected to network: " << network->name() | 900 VLOG(1) << "Connected to network: " << network->name() |
901 << " State: " << network->state(); | 901 << " State: " << network->state() |
| 902 << " Status: " << status; |
902 | 903 |
903 // If the user asked not to save credentials, flimflam will have | 904 // If the user asked not to save credentials, flimflam will have |
904 // forgotten them. Wipe our cache as well. | 905 // forgotten them. Wipe our cache as well. |
905 if (!network->save_credentials()) | 906 if (!network->save_credentials()) |
906 network->EraseCredentials(); | 907 network->EraseCredentials(); |
907 | 908 |
908 ClearActiveNetwork(network->type()); | 909 ClearActiveNetwork(network->type()); |
909 UpdateActiveNetwork(network); | 910 UpdateActiveNetwork(network); |
910 | 911 |
911 // Notify observers. | 912 // Notify observers. |
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1817 GetTpmInfo(); | 1818 GetTpmInfo(); |
1818 return tpm_slot_; | 1819 return tpm_slot_; |
1819 } | 1820 } |
1820 | 1821 |
1821 const std::string& NetworkLibraryImplBase::GetTpmPin() { | 1822 const std::string& NetworkLibraryImplBase::GetTpmPin() { |
1822 GetTpmInfo(); | 1823 GetTpmInfo(); |
1823 return tpm_pin_; | 1824 return tpm_pin_; |
1824 } | 1825 } |
1825 | 1826 |
1826 } // namespace chromeos | 1827 } // namespace chromeos |
OLD | NEW |