chrome/browser/ui/autofill/data_model_wrapper.cc - Issue 17392006: In components/autofill, move browser/ to core/browser/

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

Issue 17392006: In components/autofill, move browser/ to core/browser/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to fix conflicts Created 7 years, 6 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

OLD	NEW
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/callback.h"	7 #include "base/callback.h"

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"	10 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"

11 #include "components/autofill/browser/autofill_data_model.h"

12 #include "components/autofill/browser/autofill_profile.h"

13 #include "components/autofill/browser/autofill_type.h"

14 #include "components/autofill/browser/credit_card.h"

15 #include "components/autofill/browser/form_structure.h"

16 #include "components/autofill/browser/validation.h"

17 #include "components/autofill/content/browser/wallet/full_wallet.h"	11 #include "components/autofill/content/browser/wallet/full_wallet.h"

18 #include "components/autofill/content/browser/wallet/wallet_address.h"	12 #include "components/autofill/content/browser/wallet/wallet_address.h"

19 #include "components/autofill/content/browser/wallet/wallet_items.h"	13 #include "components/autofill/content/browser/wallet/wallet_items.h"

	14 #include "components/autofill/core/browser/autofill_data_model.h"

	15 #include "components/autofill/core/browser/autofill_profile.h"

	16 #include "components/autofill/core/browser/autofill_type.h"

	17 #include "components/autofill/core/browser/credit_card.h"

	18 #include "components/autofill/core/browser/form_structure.h"

	19 #include "components/autofill/core/browser/validation.h"

20 #include "ui/base/resource/resource_bundle.h"	20 #include "ui/base/resource/resource_bundle.h"

21 #include "ui/gfx/image/image.h"	21 #include "ui/gfx/image/image.h"

22	22

23 namespace autofill {	23 namespace autofill {

24	24

25 DataModelWrapper::~DataModelWrapper() {}	25 DataModelWrapper::~DataModelWrapper() {}

26	26

27 string16 DataModelWrapper::GetDisplayText() {	27 string16 DataModelWrapper::GetDisplayText() {

28 string16 comma = ASCIIToUTF16(", ");	28 string16 comma = ASCIIToUTF16(", ");

29 string16 label = GetInfo(NAME_FULL) + comma + GetInfo(ADDRESS_HOME_LINE1);	29 string16 label = GetInfo(NAME_FULL) + comma + GetInfo(ADDRESS_HOME_LINE1);

(...skipping 223 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
253 }	253 }

254	254

255 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}	255 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}

256	256

257 string16 FullWalletShippingWrapper::GetInfo(AutofillFieldType type) const {	257 string16 FullWalletShippingWrapper::GetInfo(AutofillFieldType type) const {

258 return full_wallet_->shipping_address()->GetInfo(	258 return full_wallet_->shipping_address()->GetInfo(

259 type, g_browser_process->GetApplicationLocale());	259 type, g_browser_process->GetApplicationLocale());

260 }	260 }

261	261

262 } // namespace autofill	262 } // namespace autofill

OLD	NEW

« no previous file with comments | « chrome/browser/ui/autofill/data_model_wrapper.h ('k') | chrome/browser/ui/autofill/data_model_wrapper_unittest.cc » ('j') | no next file with comments »