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

Side by Side Diff: chrome/browser/ui/autofill/data_model_wrapper.cc

Issue 261013010: autocomplete: add ability to get full address (hidden behind a flag). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self review Created 6 years, 7 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/browser/ui/autofill/autofill_dialog_i18n_input.cc ('k') | components/autofill.gypi » ('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 "chrome/browser/ui/autofill/data_model_wrapper.h" 5 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.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"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h" 12 #include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
13 #include "chrome/browser/ui/autofill/autofill_dialog_models.h" 13 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
14 #include "components/autofill/content/browser/wallet/full_wallet.h" 14 #include "components/autofill/content/browser/wallet/full_wallet.h"
15 #include "components/autofill/content/browser/wallet/wallet_address.h" 15 #include "components/autofill/content/browser/wallet/wallet_address.h"
16 #include "components/autofill/content/browser/wallet/wallet_items.h" 16 #include "components/autofill/content/browser/wallet/wallet_items.h"
17 #include "components/autofill/core/browser/address_i18n.h"
17 #include "components/autofill/core/browser/autofill_country.h" 18 #include "components/autofill/core/browser/autofill_country.h"
18 #include "components/autofill/core/browser/autofill_data_model.h" 19 #include "components/autofill/core/browser/autofill_data_model.h"
19 #include "components/autofill/core/browser/autofill_field.h" 20 #include "components/autofill/core/browser/autofill_field.h"
20 #include "components/autofill/core/browser/autofill_profile.h" 21 #include "components/autofill/core/browser/autofill_profile.h"
21 #include "components/autofill/core/browser/autofill_type.h" 22 #include "components/autofill/core/browser/autofill_type.h"
22 #include "components/autofill/core/browser/credit_card.h" 23 #include "components/autofill/core/browser/credit_card.h"
23 #include "components/autofill/core/browser/form_structure.h" 24 #include "components/autofill/core/browser/form_structure.h"
24 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/addre ss_data.h" 25 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/addre ss_data.h"
25 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/addre ss_ui.h" 26 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/addre ss_ui.h"
26 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
(...skipping 21 matching lines...) Expand all
48 49
49 bool DataModelWrapper::GetDisplayText( 50 bool DataModelWrapper::GetDisplayText(
50 base::string16* vertically_compact, 51 base::string16* vertically_compact,
51 base::string16* horizontally_compact) { 52 base::string16* horizontally_compact) {
52 base::string16 phone = 53 base::string16 phone =
53 GetInfoForDisplay(AutofillType(PHONE_HOME_WHOLE_NUMBER)); 54 GetInfoForDisplay(AutofillType(PHONE_HOME_WHOLE_NUMBER));
54 if (phone.empty()) 55 if (phone.empty())
55 return false; 56 return false;
56 57
57 // Format the address. 58 // Format the address.
58 ::i18n::addressinput::AddressData address_data; 59 scoped_ptr< ::i18n::addressinput::AddressData> address_data =
59 i18ninput::CreateAddressData( 60 i18n::CreateAddressData(
60 base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)), 61 base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)));
61 &address_data); 62 address_data->language_code = GetLanguageCode();
62 address_data.language_code = GetLanguageCode();
63 std::vector<std::string> lines; 63 std::vector<std::string> lines;
64 address_data.FormatForDisplay(&lines); 64 address_data->FormatForDisplay(&lines);
65 65
66 // Email and phone number aren't part of address formatting. 66 // Email and phone number aren't part of address formatting.
67 base::string16 non_address_info; 67 base::string16 non_address_info;
68 base::string16 email = GetInfoForDisplay(AutofillType(EMAIL_ADDRESS)); 68 base::string16 email = GetInfoForDisplay(AutofillType(EMAIL_ADDRESS));
69 if (!email.empty()) 69 if (!email.empty())
70 non_address_info += base::ASCIIToUTF16("\n") + email; 70 non_address_info += base::ASCIIToUTF16("\n") + email;
71 71
72 non_address_info += base::ASCIIToUTF16("\n") + phone; 72 non_address_info += base::ASCIIToUTF16("\n") + phone;
73 73
74 // The separator is locale-specific. 74 // The separator is locale-specific.
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 } 396 }
397 397
398 return base::UTF8ToUTF16(address_->GetFieldValue(field)); 398 return base::UTF8ToUTF16(address_->GetFieldValue(field));
399 } 399 }
400 400
401 const std::string& I18nAddressDataWrapper::GetLanguageCode() const { 401 const std::string& I18nAddressDataWrapper::GetLanguageCode() const {
402 return address_->language_code; 402 return address_->language_code;
403 } 403 }
404 404
405 } // namespace autofill 405 } // namespace autofill
OLDNEW
« no previous file with comments | « chrome/browser/ui/autofill/autofill_dialog_i18n_input.cc ('k') | components/autofill.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698