Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: chrome/utility/networking_private_handler.cc

Issue 30753002: Move GetVisibleNetworks network type filtering to WiFiService interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address codereview comments. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/utility/networking_private_handler.h ('k') | chrome/utility/wifi/wifi_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 void NetworkingPrivateHandler::WiFiStartDisconnectSucceeded( 145 void NetworkingPrivateHandler::WiFiStartDisconnectSucceeded(
146 int message_id, 146 int message_id,
147 const std::string& network_guid) { 147 const std::string& network_guid) {
148 Send(new NetworkingPrivateMsg_StartDisconnect_Succeeded(message_id, 148 Send(new NetworkingPrivateMsg_StartDisconnect_Succeeded(message_id,
149 network_guid)); 149 network_guid));
150 } 150 }
151 151
152 void NetworkingPrivateHandler::OnRequestNetworkScan() { 152 void NetworkingPrivateHandler::OnRequestNetworkScan() {
153 wifi_service_->GetVisibleNetworks( 153 wifi_service_->GetVisibleNetworks(
154 std::string(),
154 base::Bind(&NetworkingPrivateHandler::WiFiNetworkScanSucceeded, 155 base::Bind(&NetworkingPrivateHandler::WiFiNetworkScanSucceeded,
155 base::Unretained(this)), 156 base::Unretained(this)),
156 base::Bind( 157 base::Bind(
157 &NetworkingPrivateHandler::WiFiApiError, base::Unretained(this), 0)); 158 &NetworkingPrivateHandler::WiFiApiError, base::Unretained(this), 0));
158 wifi_service_->RequestNetworkScan(); 159 wifi_service_->RequestNetworkScan();
159 } 160 }
160 161
161 void NetworkingPrivateHandler::WiFiNetworkScanSucceeded( 162 void NetworkingPrivateHandler::WiFiNetworkScanSucceeded(
162 const WiFiService::NetworkList& network_list) { 163 const WiFiService::NetworkList& network_list) {
163 std::vector<std::string> list; 164 std::vector<std::string> list;
164 for (WiFiService::NetworkList::const_iterator it = network_list.begin(); 165 for (WiFiService::NetworkList::const_iterator it = network_list.begin();
165 it != network_list.end(); 166 it != network_list.end();
166 ++it) { 167 ++it) {
167 list.push_back(it->guid); 168 list.push_back(it->guid);
168 } 169 }
169 170
170 Send(new NetworkingPrivateMsg_NetworkListChanged_Event(list)); 171 Send(new NetworkingPrivateMsg_NetworkListChanged_Event(list));
171 } 172 }
172 173
173 void NetworkingPrivateHandler::OnGetVisibleNetworks(int message_id) { 174 void NetworkingPrivateHandler::OnGetVisibleNetworks(
175 int message_id,
176 const std::string& network_type) {
174 wifi_service_->GetVisibleNetworks( 177 wifi_service_->GetVisibleNetworks(
178 network_type,
175 base::Bind(&NetworkingPrivateHandler::WiFiGetVisibleNetworksSucceeded, 179 base::Bind(&NetworkingPrivateHandler::WiFiGetVisibleNetworksSucceeded,
176 base::Unretained(this), 180 base::Unretained(this),
177 message_id), 181 message_id),
178 base::Bind(&NetworkingPrivateHandler::WiFiApiError, 182 base::Bind(&NetworkingPrivateHandler::WiFiApiError,
179 base::Unretained(this), 183 base::Unretained(this),
180 message_id)); 184 message_id));
181 } 185 }
182 186
183 void NetworkingPrivateHandler::WiFiGetVisibleNetworksSucceeded( 187 void NetworkingPrivateHandler::WiFiGetVisibleNetworksSucceeded(
184 int message_id, 188 int message_id,
(...skipping 22 matching lines...) Expand all
207 } 211 }
208 212
209 void NetworkingPrivateHandler::WiFiNetworksChangedEvent( 213 void NetworkingPrivateHandler::WiFiNetworksChangedEvent(
210 const WiFiService::NetworkGuidList& network_guid_list) { 214 const WiFiService::NetworkGuidList& network_guid_list) {
211 std::vector<std::string> networks(network_guid_list.begin(), 215 std::vector<std::string> networks(network_guid_list.begin(),
212 network_guid_list.end()); 216 network_guid_list.end());
213 Send(new NetworkingPrivateMsg_NetworksChanged_Event(networks)); 217 Send(new NetworkingPrivateMsg_NetworksChanged_Event(networks));
214 } 218 }
215 219
216 } // namespace chrome 220 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/utility/networking_private_handler.h ('k') | chrome/utility/wifi/wifi_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698