OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/utility/networking_private_handler.h" | 5 #include "chrome/utility/networking_private_handler.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
11 #include "base/threading/thread.h" | 11 #include "base/threading/thread.h" |
12 #include "chrome/common/networking_private_messages.h" | 12 #include "chrome/common/networking_private_messages.h" |
13 #include "content/public/utility/utility_thread.h" | 13 #include "content/public/utility/utility_thread.h" |
14 | 14 |
15 using wifi::WiFiService; | 15 using wifi::WiFiService; |
16 | 16 |
17 namespace chrome { | 17 namespace chrome { |
18 | 18 |
19 NetworkingPrivateHandler::NetworkingPrivateHandler() | 19 NetworkingPrivateHandler::NetworkingPrivateHandler() |
20 : wifi_service_(WiFiService::CreateService()) { | 20 : wifi_service_(WiFiService::CreateService()) { |
| 21 wifi_service_->Initialize(); |
21 wifi_service_->SetNetworksChangedObserver( | 22 wifi_service_->SetNetworksChangedObserver( |
22 base::Bind(&NetworkingPrivateHandler::WiFiNetworksChangedEvent, | 23 base::Bind(&NetworkingPrivateHandler::WiFiNetworksChangedEvent, |
23 base::Unretained(this))); | 24 base::Unretained(this))); |
24 wifi_service_->SetNetworkListChangedObserver( | 25 wifi_service_->SetNetworkListChangedObserver( |
25 base::Bind(&NetworkingPrivateHandler::WiFiNetworkListChangedEvent, | 26 base::Bind(&NetworkingPrivateHandler::WiFiNetworkListChangedEvent, |
26 base::Unretained(this))); | 27 base::Unretained(this))); |
27 } | 28 } |
28 | 29 |
29 NetworkingPrivateHandler::~NetworkingPrivateHandler() {} | 30 NetworkingPrivateHandler::~NetworkingPrivateHandler() {} |
30 | 31 |
(...skipping 12 matching lines...) Expand all Loading... |
43 IPC_MESSAGE_HANDLER(NetworkingPrivateMsg_RequestNetworkScan, | 44 IPC_MESSAGE_HANDLER(NetworkingPrivateMsg_RequestNetworkScan, |
44 OnRequestNetworkScan) | 45 OnRequestNetworkScan) |
45 IPC_MESSAGE_UNHANDLED(handled = false) | 46 IPC_MESSAGE_UNHANDLED(handled = false) |
46 IPC_END_MESSAGE_MAP() | 47 IPC_END_MESSAGE_MAP() |
47 return handled; | 48 return handled; |
48 } | 49 } |
49 | 50 |
50 void NetworkingPrivateHandler::OnSetUpForTest( | 51 void NetworkingPrivateHandler::OnSetUpForTest( |
51 const base::DictionaryValue& parameters) { | 52 const base::DictionaryValue& parameters) { |
52 wifi_service_.reset(WiFiService::CreateServiceMock()); | 53 wifi_service_.reset(WiFiService::CreateServiceMock()); |
| 54 wifi_service_->Initialize(); |
53 wifi_service_->SetNetworksChangedObserver( | 55 wifi_service_->SetNetworksChangedObserver( |
54 base::Bind(&NetworkingPrivateHandler::WiFiNetworksChangedEvent, | 56 base::Bind(&NetworkingPrivateHandler::WiFiNetworksChangedEvent, |
55 base::Unretained(this))); | 57 base::Unretained(this))); |
56 wifi_service_->SetNetworkListChangedObserver( | 58 wifi_service_->SetNetworkListChangedObserver( |
57 base::Bind(&NetworkingPrivateHandler::WiFiNetworkListChangedEvent, | 59 base::Bind(&NetworkingPrivateHandler::WiFiNetworkListChangedEvent, |
58 base::Unretained(this))); | 60 base::Unretained(this))); |
59 } | 61 } |
60 | 62 |
61 void NetworkingPrivateHandler::WiFiApiError( | 63 void NetworkingPrivateHandler::WiFiApiError( |
62 int message_id, | 64 int message_id, |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 } | 209 } |
208 | 210 |
209 void NetworkingPrivateHandler::WiFiNetworksChangedEvent( | 211 void NetworkingPrivateHandler::WiFiNetworksChangedEvent( |
210 const WiFiService::NetworkGuidList& network_guid_list) { | 212 const WiFiService::NetworkGuidList& network_guid_list) { |
211 std::vector<std::string> networks(network_guid_list.begin(), | 213 std::vector<std::string> networks(network_guid_list.begin(), |
212 network_guid_list.end()); | 214 network_guid_list.end()); |
213 Send(new NetworkingPrivateMsg_NetworksChanged_Event(networks)); | 215 Send(new NetworkingPrivateMsg_NetworksChanged_Event(networks)); |
214 } | 216 } |
215 | 217 |
216 } // namespace chrome | 218 } // namespace chrome |
OLD | NEW |