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 "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/memory/scoped_vector.h" | 9 #include "base/memory/scoped_vector.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "chrome/browser/chromeos/cros/network_constants.h" | 12 #include "chrome/browser/chromeos/cros/network_constants.h" |
13 #include "chrome/browser/chromeos/login/user_manager.h" | 13 #include "chrome/browser/chromeos/login/user_manager.h" |
14 #include "chrome/browser/chromeos/net/onc_utils.h" | 14 #include "chrome/browser/chromeos/net/onc_utils.h" |
15 #include "chrome/browser/chromeos/network_login_observer.h" | 15 #include "chrome/browser/chromeos/network_login_observer.h" |
| 16 #include "chromeos/network/network_state_handler.h" |
16 #include "chromeos/network/network_ui_data.h" | 17 #include "chromeos/network/network_ui_data.h" |
17 #include "chromeos/network/onc/onc_constants.h" | 18 #include "chromeos/network/onc/onc_constants.h" |
18 #include "chromeos/network/onc/onc_normalizer.h" | 19 #include "chromeos/network/onc/onc_normalizer.h" |
19 #include "chromeos/network/onc/onc_signature.h" | 20 #include "chromeos/network/onc/onc_signature.h" |
20 #include "chromeos/network/onc/onc_translator.h" | 21 #include "chromeos/network/onc/onc_translator.h" |
21 #include "chromeos/network/onc/onc_utils.h" | 22 #include "chromeos/network/onc/onc_utils.h" |
22 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
23 #include "crypto/nss_util.h" // crypto::GetTPMTokenInfo() for 802.1X and VPN. | 24 #include "crypto/nss_util.h" // crypto::GetTPMTokenInfo() for 802.1X and VPN. |
24 #include "third_party/cros_system_api/dbus/service_constants.h" | 25 #include "third_party/cros_system_api/dbus/service_constants.h" |
25 | 26 |
(...skipping 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1195 | 1196 |
1196 if (from_policy) { | 1197 if (from_policy) { |
1197 // For policy-managed networks, go through the list of existing remembered | 1198 // For policy-managed networks, go through the list of existing remembered |
1198 // networks and clean out the ones that no longer have a definition in the | 1199 // networks and clean out the ones that no longer have a definition in the |
1199 // ONC blob. We first collect the networks and do the actual deletion later | 1200 // ONC blob. We first collect the networks and do the actual deletion later |
1200 // because ForgetNetwork() changes the remembered network vectors. | 1201 // because ForgetNetwork() changes the remembered network vectors. |
1201 ForgetNetworksById(source, network_ids, false); | 1202 ForgetNetworksById(source, network_ids, false); |
1202 } else if (source == onc::ONC_SOURCE_USER_IMPORT && !removal_ids.empty()) { | 1203 } else if (source == onc::ONC_SOURCE_USER_IMPORT && !removal_ids.empty()) { |
1203 ForgetNetworksById(source, removal_ids, true); | 1204 ForgetNetworksById(source, removal_ids, true); |
1204 } | 1205 } |
| 1206 // Ensure NetworkStateHandler properties are up-to-date. |
| 1207 if (NetworkStateHandler::IsInitialized()) |
| 1208 NetworkStateHandler::Get()->RequestUpdateForAllNetworks(); |
1205 } | 1209 } |
1206 | 1210 |
1207 //////////////////////////////////////////////////////////////////////////// | 1211 //////////////////////////////////////////////////////////////////////////// |
1208 // Testing functions. | 1212 // Testing functions. |
1209 | 1213 |
1210 bool NetworkLibraryImplBase::SetActiveNetwork( | 1214 bool NetworkLibraryImplBase::SetActiveNetwork( |
1211 ConnectionType type, const std::string& service_path) { | 1215 ConnectionType type, const std::string& service_path) { |
1212 Network* network = NULL; | 1216 Network* network = NULL; |
1213 if (!service_path.empty()) | 1217 if (!service_path.empty()) |
1214 network = FindNetworkByPath(service_path); | 1218 network = FindNetworkByPath(service_path); |
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1718 GetTpmInfo(); | 1722 GetTpmInfo(); |
1719 return tpm_slot_; | 1723 return tpm_slot_; |
1720 } | 1724 } |
1721 | 1725 |
1722 const std::string& NetworkLibraryImplBase::GetTpmPin() { | 1726 const std::string& NetworkLibraryImplBase::GetTpmPin() { |
1723 GetTpmInfo(); | 1727 GetTpmInfo(); |
1724 return tpm_pin_; | 1728 return tpm_pin_; |
1725 } | 1729 } |
1726 | 1730 |
1727 } // namespace chromeos | 1731 } // namespace chromeos |
OLD | NEW |