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

Side by Side Diff: components/autofill/content/browser/wallet/wallet_address.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "components/autofill/content/browser/wallet/wallet_address.h" 5 #include "components/autofill/content/browser/wallet/wallet_address.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_split.h" 8 #include "base/strings/string_split.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 if (type.html_type() == HTML_TYPE_COUNTRY_CODE) { 333 if (type.html_type() == HTML_TYPE_COUNTRY_CODE) {
334 DCHECK(base::IsStringASCII(country_name_code())); 334 DCHECK(base::IsStringASCII(country_name_code()));
335 return base::ASCIIToUTF16(country_name_code()); 335 return base::ASCIIToUTF16(country_name_code());
336 } 336 }
337 337
338 switch (type.GetStorableType()) { 338 switch (type.GetStorableType()) {
339 case NAME_FULL: 339 case NAME_FULL:
340 return recipient_name(); 340 return recipient_name();
341 341
342 case ADDRESS_HOME_STREET_ADDRESS: 342 case ADDRESS_HOME_STREET_ADDRESS:
343 return JoinString(street_address_, base::ASCIIToUTF16("\n")); 343 return base::JoinString(street_address_, base::ASCIIToUTF16("\n"));
344 344
345 case ADDRESS_HOME_LINE1: 345 case ADDRESS_HOME_LINE1:
346 return GetStreetAddressLine(0); 346 return GetStreetAddressLine(0);
347 347
348 case ADDRESS_HOME_LINE2: 348 case ADDRESS_HOME_LINE2:
349 return GetStreetAddressLine(1); 349 return GetStreetAddressLine(1);
350 350
351 case ADDRESS_HOME_CITY: 351 case ADDRESS_HOME_CITY:
352 return locality_name(); 352 return locality_name();
353 353
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 language_code_ == other.language_code_ && 411 language_code_ == other.language_code_ &&
412 EqualsIgnoreID(other); 412 EqualsIgnoreID(other);
413 } 413 }
414 414
415 bool Address::operator!=(const Address& other) const { 415 bool Address::operator!=(const Address& other) const {
416 return !(*this == other); 416 return !(*this == other);
417 } 417 }
418 418
419 } // namespace wallet 419 } // namespace wallet
420 } // namespace autofill 420 } // namespace autofill
OLDNEW
« no previous file with comments | « cloud_print/virtual_driver/win/install/setup.cc ('k') | components/autofill/content/renderer/autofill_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698