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

Side by Side Diff: chromeos/network/network_change_notifier_chromeos.cc

Issue 1237873004: Revert of Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « chromecast/base/process_utils.cc ('k') | chromeos/network/onc/onc_validator.cc » ('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) 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 <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 "NCNDefaultIPAddressChanged", 204 "NCNDefaultIPAddressChanged",
205 is_suppressed ? " (Suppressed)" : "" ), 205 is_suppressed ? " (Suppressed)" : "" ),
206 base::StringPrintf("%s -> %s", 206 base::StringPrintf("%s -> %s",
207 ip_address_.c_str(), 207 ip_address_.c_str(),
208 default_network->ip_address().c_str())); 208 default_network->ip_address().c_str()));
209 } 209 }
210 if (default_network->dns_servers() != dns_servers_) { 210 if (default_network->dns_servers() != dns_servers_) {
211 NET_LOG_EVENT( 211 NET_LOG_EVENT(
212 "NCNDefaultDNSServerChanged", 212 "NCNDefaultDNSServerChanged",
213 base::StringPrintf( 213 base::StringPrintf(
214 "%s -> %s", base::JoinString(dns_servers_, ",").c_str(), 214 "%s -> %s",
215 base::JoinString(default_network->dns_servers(), ",").c_str())); 215 JoinString(dns_servers_, ",").c_str(),
216 JoinString(default_network->dns_servers(), ",").c_str()));
216 *dns_changed = true; 217 *dns_changed = true;
217 } 218 }
218 219
219 connection_type_ = new_connection_type; 220 connection_type_ = new_connection_type;
220 service_path_ = default_network->path(); 221 service_path_ = default_network->path();
221 ip_address_ = default_network->ip_address(); 222 ip_address_ = default_network->ip_address();
222 dns_servers_ = default_network->dns_servers(); 223 dns_servers_ = default_network->dns_servers();
223 double old_max_bandwidth = max_bandwidth_mbps_; 224 double old_max_bandwidth = max_bandwidth_mbps_;
224 max_bandwidth_mbps_ = 225 max_bandwidth_mbps_ =
225 GetMaxBandwidthForConnectionSubtype(GetConnectionSubtype( 226 GetMaxBandwidthForConnectionSubtype(GetConnectionSubtype(
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 // produce a single signal when switching between network connections. 300 // produce a single signal when switching between network connections.
300 params.ip_address_offline_delay_ = base::TimeDelta::FromMilliseconds(4000); 301 params.ip_address_offline_delay_ = base::TimeDelta::FromMilliseconds(4000);
301 params.ip_address_online_delay_ = base::TimeDelta::FromMilliseconds(1000); 302 params.ip_address_online_delay_ = base::TimeDelta::FromMilliseconds(1000);
302 params.connection_type_offline_delay_ = 303 params.connection_type_offline_delay_ =
303 base::TimeDelta::FromMilliseconds(500); 304 base::TimeDelta::FromMilliseconds(500);
304 params.connection_type_online_delay_ = base::TimeDelta::FromMilliseconds(500); 305 params.connection_type_online_delay_ = base::TimeDelta::FromMilliseconds(500);
305 return params; 306 return params;
306 } 307 }
307 308
308 } // namespace chromeos 309 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromecast/base/process_utils.cc ('k') | chromeos/network/onc/onc_validator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698