| 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/strings/string_util.h" | 11 #include "base/strings/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" | |
| 16 #include "chromeos/network/network_state_handler.h" | 15 #include "chromeos/network/network_state_handler.h" |
| 17 #include "chromeos/network/network_ui_data.h" | 16 #include "chromeos/network/network_ui_data.h" |
| 18 #include "chromeos/network/onc/onc_constants.h" | 17 #include "chromeos/network/onc/onc_constants.h" |
| 19 #include "chromeos/network/onc/onc_normalizer.h" | 18 #include "chromeos/network/onc/onc_normalizer.h" |
| 20 #include "chromeos/network/onc/onc_signature.h" | 19 #include "chromeos/network/onc/onc_signature.h" |
| 21 #include "chromeos/network/onc/onc_translator.h" | 20 #include "chromeos/network/onc/onc_translator.h" |
| 22 #include "chromeos/network/onc/onc_utils.h" | 21 #include "chromeos/network/onc/onc_utils.h" |
| 23 #include "content/public/browser/browser_thread.h" | 22 #include "content/public/browser/browser_thread.h" |
| 24 #include "crypto/nss_util.h" // crypto::GetTPMTokenInfo() for 802.1X and VPN. | 23 #include "crypto/nss_util.h" // crypto::GetTPMTokenInfo() for 802.1X and VPN. |
| 25 #include "third_party/cros_system_api/dbus/service_constants.h" | 24 #include "third_party/cros_system_api/dbus/service_constants.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 active_wimax_(NULL), | 58 active_wimax_(NULL), |
| 60 active_virtual_(NULL), | 59 active_virtual_(NULL), |
| 61 available_devices_(0), | 60 available_devices_(0), |
| 62 uninitialized_devices_(0), | 61 uninitialized_devices_(0), |
| 63 enabled_devices_(0), | 62 enabled_devices_(0), |
| 64 busy_devices_(0), | 63 busy_devices_(0), |
| 65 wifi_scanning_(false), | 64 wifi_scanning_(false), |
| 66 is_locked_(false), | 65 is_locked_(false), |
| 67 sim_operation_(SIM_OPERATION_NONE), | 66 sim_operation_(SIM_OPERATION_NONE), |
| 68 notify_manager_weak_factory_(this) { | 67 notify_manager_weak_factory_(this) { |
| 69 network_login_observer_.reset(new NetworkLoginObserver()); | |
| 70 AddNetworkManagerObserver(network_login_observer_.get()); | |
| 71 } | 68 } |
| 72 | 69 |
| 73 NetworkLibraryImplBase::~NetworkLibraryImplBase() { | 70 NetworkLibraryImplBase::~NetworkLibraryImplBase() { |
| 74 network_profile_observers_.Clear(); | 71 network_profile_observers_.Clear(); |
| 75 network_manager_observers_.Clear(); | 72 network_manager_observers_.Clear(); |
| 76 pin_operation_observers_.Clear(); | 73 pin_operation_observers_.Clear(); |
| 77 STLDeleteValues(&network_map_); | 74 STLDeleteValues(&network_map_); |
| 78 ClearNetworks(); | 75 ClearNetworks(); |
| 79 DeleteRememberedNetworks(); | 76 DeleteRememberedNetworks(); |
| 80 STLDeleteValues(&device_map_); | 77 STLDeleteValues(&device_map_); |
| (...skipping 1508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1589 GetTpmInfo(); | 1586 GetTpmInfo(); |
| 1590 return tpm_slot_; | 1587 return tpm_slot_; |
| 1591 } | 1588 } |
| 1592 | 1589 |
| 1593 const std::string& NetworkLibraryImplBase::GetTpmPin() { | 1590 const std::string& NetworkLibraryImplBase::GetTpmPin() { |
| 1594 GetTpmInfo(); | 1591 GetTpmInfo(); |
| 1595 return tpm_pin_; | 1592 return tpm_pin_; |
| 1596 } | 1593 } |
| 1597 | 1594 |
| 1598 } // namespace chromeos | 1595 } // namespace chromeos |
| OLD | NEW |