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 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
835 NetworkConnectStart(vpn, PROFILE_NONE); | 835 NetworkConnectStart(vpn, PROFILE_NONE); |
836 } | 836 } |
837 | 837 |
838 void NetworkLibraryImplBase::NetworkConnectStart( | 838 void NetworkLibraryImplBase::NetworkConnectStart( |
839 Network* network, NetworkProfileType profile_type) { | 839 Network* network, NetworkProfileType profile_type) { |
840 DCHECK(network); | 840 DCHECK(network); |
841 DCHECK(!network->connection_started()); | 841 DCHECK(!network->connection_started()); |
842 // In order to be certain to trigger any notifications, set the connecting | 842 // In order to be certain to trigger any notifications, set the connecting |
843 // state locally and notify observers. Otherwise there might be a state | 843 // state locally and notify observers. Otherwise there might be a state |
844 // change without a forced notify. | 844 // change without a forced notify. |
845 network->set_connecting(true); | 845 network->set_connecting(); |
846 // Distinguish between user-initiated connection attempts | 846 // Distinguish between user-initiated connection attempts |
847 // and auto-connect. | 847 // and auto-connect. |
848 network->set_connection_started(true); | 848 network->set_connection_started(true); |
849 NotifyNetworkManagerChanged(true); // Forced update. | 849 NotifyNetworkManagerChanged(true); // Forced update. |
850 VLOG(1) << "Requesting connect to network: " << network->name() | 850 VLOG(1) << "Requesting connect to network: " << network->name() |
851 << " profile type: " << profile_type; | 851 << " profile type: " << profile_type; |
852 // Specify the correct profile for wifi networks (if specified or unset). | 852 // Specify the correct profile for wifi networks (if specified or unset). |
853 if ((network->type() == TYPE_WIFI || network->type() == TYPE_WIMAX) && | 853 if ((network->type() == TYPE_WIFI || network->type() == TYPE_WIMAX) && |
854 (profile_type != PROFILE_NONE || | 854 (profile_type != PROFILE_NONE || |
855 network->profile_type() == PROFILE_NONE)) { | 855 network->profile_type() == PROFILE_NONE)) { |
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1816 GetTpmInfo(); | 1816 GetTpmInfo(); |
1817 return tpm_slot_; | 1817 return tpm_slot_; |
1818 } | 1818 } |
1819 | 1819 |
1820 const std::string& NetworkLibraryImplBase::GetTpmPin() { | 1820 const std::string& NetworkLibraryImplBase::GetTpmPin() { |
1821 GetTpmInfo(); | 1821 GetTpmInfo(); |
1822 return tpm_pin_; | 1822 return tpm_pin_; |
1823 } | 1823 } |
1824 | 1824 |
1825 } // namespace chromeos | 1825 } // namespace chromeos |
OLD | NEW |