| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/local_discovery/wifi/wifi_manager_nonchromeos.h" | 5 #include "chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h" |
| 6 | 6 |
| 7 #include "base/cancelable_callback.h" | 7 #include "base/cancelable_callback.h" |
| 8 #include "base/thread_task_runner_handle.h" |
| 8 #include "base/threading/sequenced_worker_pool.h" | 9 #include "base/threading/sequenced_worker_pool.h" |
| 9 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
| 10 #include "components/onc/onc_constants.h" | 11 #include "components/onc/onc_constants.h" |
| 11 #include "components/wifi/wifi_service.h" | 12 #include "components/wifi/wifi_service.h" |
| 12 #include "content/public/browser/browser_thread.h" | 13 #include "content/public/browser/browser_thread.h" |
| 13 #include "net/base/network_change_notifier.h" | 14 #include "net/base/network_change_notifier.h" |
| 14 | 15 |
| 15 #if defined(OS_WIN) | 16 #if defined(OS_WIN) |
| 16 #include "chrome/browser/local_discovery/wifi/credential_getter_win.h" | 17 #include "chrome/browser/local_discovery/wifi/credential_getter_win.h" |
| 17 #endif // OS_WIN | 18 #endif // OS_WIN |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 | 114 |
| 114 WifiManager::SuccessCallback connect_success_callback_; | 115 WifiManager::SuccessCallback connect_success_callback_; |
| 115 base::CancelableClosure connect_failure_callback_; | 116 base::CancelableClosure connect_failure_callback_; |
| 116 | 117 |
| 117 // SSID of previously connected network. | 118 // SSID of previously connected network. |
| 118 std::string connected_network_guid_; | 119 std::string connected_network_guid_; |
| 119 | 120 |
| 120 // SSID of network we are connecting to. | 121 // SSID of network we are connecting to. |
| 121 std::string connecting_network_guid_; | 122 std::string connecting_network_guid_; |
| 122 | 123 |
| 123 scoped_refptr<base::MessageLoopProxy> callback_runner_; | 124 scoped_refptr<base::SingleThreadTaskRunner> callback_runner_; |
| 124 | 125 |
| 125 #if defined(OS_WIN) | 126 #if defined(OS_WIN) |
| 126 scoped_refptr<CredentialGetterWin> credential_getter_; | 127 scoped_refptr<CredentialGetterWin> credential_getter_; |
| 127 #endif // OS_WIN | 128 #endif // OS_WIN |
| 128 | 129 |
| 129 base::WeakPtrFactory<WifiServiceWrapper> weak_factory_; | 130 base::WeakPtrFactory<WifiServiceWrapper> weak_factory_; |
| 130 | 131 |
| 131 DISALLOW_COPY_AND_ASSIGN(WifiServiceWrapper); | 132 DISALLOW_COPY_AND_ASSIGN(WifiServiceWrapper); |
| 132 }; | 133 }; |
| 133 | 134 |
| 134 WifiManagerNonChromeos::WifiServiceWrapper::WifiServiceWrapper( | 135 WifiManagerNonChromeos::WifiServiceWrapper::WifiServiceWrapper( |
| 135 base::WeakPtr<WifiManagerNonChromeos> wifi_manager) | 136 base::WeakPtr<WifiManagerNonChromeos> wifi_manager) |
| 136 : wifi_manager_(wifi_manager), | 137 : wifi_manager_(wifi_manager), |
| 137 callback_runner_(base::MessageLoopProxy::current()), | 138 callback_runner_(base::ThreadTaskRunnerHandle::Get()), |
| 138 weak_factory_(this) { | 139 weak_factory_(this) { |
| 139 } | 140 } |
| 140 | 141 |
| 141 WifiManagerNonChromeos::WifiServiceWrapper::~WifiServiceWrapper() { | 142 WifiManagerNonChromeos::WifiServiceWrapper::~WifiServiceWrapper() { |
| 142 net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this); | 143 net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this); |
| 143 } | 144 } |
| 144 | 145 |
| 145 void WifiManagerNonChromeos::WifiServiceWrapper::Start() { | 146 void WifiManagerNonChromeos::WifiServiceWrapper::Start() { |
| 146 DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); | 147 DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); |
| 147 wifi_service_.reset(WiFiService::Create()); | 148 wifi_service_.reset(WiFiService::Create()); |
| 148 | 149 |
| 149 wifi_service_->Initialize(base::MessageLoopProxy::current()); | 150 wifi_service_->Initialize(base::ThreadTaskRunnerHandle::Get()); |
| 150 | 151 |
| 151 wifi_service_->SetEventObservers( | 152 wifi_service_->SetEventObservers( |
| 152 base::MessageLoopProxy::current(), | 153 base::ThreadTaskRunnerHandle::Get(), |
| 153 base::Bind(&WifiServiceWrapper::OnNetworksChangedEvent, AsWeakPtr()), | 154 base::Bind(&WifiServiceWrapper::OnNetworksChangedEvent, AsWeakPtr()), |
| 154 base::Bind(&WifiServiceWrapper::OnNetworkListChangedEvent, AsWeakPtr())); | 155 base::Bind(&WifiServiceWrapper::OnNetworkListChangedEvent, AsWeakPtr())); |
| 155 | 156 |
| 156 net::NetworkChangeNotifier::AddNetworkChangeObserver(this); | 157 net::NetworkChangeNotifier::AddNetworkChangeObserver(this); |
| 157 } | 158 } |
| 158 | 159 |
| 159 void WifiManagerNonChromeos::WifiServiceWrapper::GetSSIDList( | 160 void WifiManagerNonChromeos::WifiServiceWrapper::GetSSIDList( |
| 160 const WifiManager::SSIDListCallback& callback) { | 161 const WifiManager::SSIDListCallback& callback) { |
| 161 DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); | 162 DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); |
| 162 | 163 |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 } | 563 } |
| 563 | 564 |
| 564 void WifiManagerNonChromeos::RemoveNetworkListObserver( | 565 void WifiManagerNonChromeos::RemoveNetworkListObserver( |
| 565 NetworkListObserver* observer) { | 566 NetworkListObserver* observer) { |
| 566 network_list_observers_.RemoveObserver(observer); | 567 network_list_observers_.RemoveObserver(observer); |
| 567 } | 568 } |
| 568 | 569 |
| 569 } // namespace wifi | 570 } // namespace wifi |
| 570 | 571 |
| 571 } // namespace local_discovery | 572 } // namespace local_discovery |
| OLD | NEW |