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

Side by Side Diff: chrome/browser/extensions/api/dial/dial_service.cc

Issue 23712002: Cleanup network type matching. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
OLDNEW
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/extensions/api/dial/dial_service.h" 5 #include "chrome/browser/extensions/api/dial/dial_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 #else 182 #else
183 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind( 183 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind(
184 &GetNetworkListOnFileThread, 184 &GetNetworkListOnFileThread,
185 base::MessageLoopProxy::current(), base::Bind( 185 base::MessageLoopProxy::current(), base::Bind(
186 &DialServiceImpl::SendNetworkList, AsWeakPtr()))); 186 &DialServiceImpl::SendNetworkList, AsWeakPtr())));
187 #endif 187 #endif
188 } 188 }
189 189
190 #if defined(OS_CHROMEOS) 190 #if defined(OS_CHROMEOS)
191 IPAddressNumber DialServiceImpl::GetBestBindAddressChromeOS() { 191 IPAddressNumber DialServiceImpl::GetBestBindAddressChromeOS() {
192 std::string connection_types[] = 192 std::string connection_types[] = {
193 {flimflam::kTypeWifi, flimflam::kTypeEthernet}; 193 flimflam::kTypeWifi, chromeos::NetworkStateHandler::kMatchTypeWired};
194 for (uint i = 0; i < arraysize(connection_types); ++i) { 194 for (uint i = 0; i < arraysize(connection_types); ++i) {
stevenjb 2013/08/28 15:51:30 I find this confusing. Can we move the logic below
pneubeck (no reviews) 2013/09/02 20:41:21 I will add the author as reviewer.
195 IPAddressNumber bind_ip_address; 195 IPAddressNumber bind_ip_address;
196 const chromeos::NetworkState* state = 196 const chromeos::NetworkState* state =
197 chromeos::NetworkHandler::Get()->network_state_handler()-> 197 chromeos::NetworkHandler::Get()->network_state_handler()->
198 ConnectedNetworkByType(connection_types[i]); 198 ConnectedNetworkByType(connection_types[i]);
199 if (state && 199 if (state &&
200 net::ParseIPLiteralToNumber(state->ip_address(), &bind_ip_address)) { 200 net::ParseIPLiteralToNumber(state->ip_address(), &bind_ip_address)) {
201 DCHECK(bind_ip_address.size() == net::kIPv4AddressSize); 201 DCHECK(bind_ip_address.size() == net::kIPv4AddressSize);
202 DVLOG(1) << "Found " << state->type() << ", " << state->name() << ":" 202 DVLOG(1) << "Found " << state->type() << ", " << state->name() << ":"
203 << state->ip_address(); 203 << state->ip_address();
204 return bind_ip_address; 204 return bind_ip_address;
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 DVLOG(0) << "dial socket error: " << error_str; 477 DVLOG(0) << "dial socket error: " << error_str;
478 // TODO(justinlin): More granular socket errors. 478 // TODO(justinlin): More granular socket errors.
479 FOR_EACH_OBSERVER( 479 FOR_EACH_OBSERVER(
480 Observer, observer_list_, OnError(this, DIAL_SERVICE_SOCKET_ERROR)); 480 Observer, observer_list_, OnError(this, DIAL_SERVICE_SOCKET_ERROR));
481 return false; 481 return false;
482 } 482 }
483 return true; 483 return true;
484 } 484 }
485 485
486 } // namespace extensions 486 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698