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

Side by Side Diff: chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc

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

Patch Set: Fix android build 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

« no previous file with comments | « chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc ('k') | chrome/browser/ui/autofill/account_chooser_model.h » ('j') | components/autofill/core/browser/DEPS » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 "chrome/browser/ui/android/autofill/autofill_dialog_view_android.h"

6 #include "base/android/jni_android.h"	5 #include "base/android/jni_android.h"

7 #include "base/android/jni_array.h"	6 #include "base/android/jni_array.h"

8 #include "base/android/jni_string.h"	7 #include "base/android/jni_string.h"

9 #include "base/android/scoped_java_ref.h"	8 #include "base/android/scoped_java_ref.h"

10 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

11 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

	11 #include "chrome/browser/ui/android/autofill/autofill_dialog_view_android.h"
	Nico 2013/06/18 21:52:29 This ain't right. Keep it at the top, but add an e This ain't right. Keep it at the top, but add an empty line below it. blundell 2013/06/18 22:40:11 Done. Show quoted text On 2013/06/18 21:52:29, Nico wrote: > This ain't right. Keep it at the top, but add an empty line below it. Done.
12 #include "chrome/browser/ui/android/window_android_helper.h"	12 #include "chrome/browser/ui/android/window_android_helper.h"

13 #include "chrome/browser/ui/autofill/data_model_wrapper.h"	13 #include "chrome/browser/ui/autofill/data_model_wrapper.h"

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

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

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

17 #include "content/public/browser/web_contents.h"	17 #include "content/public/browser/web_contents.h"

18 #include "grit/generated_resources.h"	18 #include "grit/generated_resources.h"

19 #include "jni/AutofillDialogGlue_jni.h"	19 #include "jni/AutofillDialogGlue_jni.h"

20 #include "ui/android/window_android.h"	20 #include "ui/android/window_android.h"

21 #include "ui/base/l10n/l10n_util.h"	21 #include "ui/base/l10n/l10n_util.h"

22 #include "ui/base/models/combobox_model.h"	22 #include "ui/base/models/combobox_model.h"

23 #include "ui/base/models/menu_model.h"	23 #include "ui/base/models/menu_model.h"

24 #include "ui/gfx/android/java_bitmap.h"	24 #include "ui/gfx/android/java_bitmap.h"

25 #include "ui/gfx/rect.h"	25 #include "ui/gfx/rect.h"

26	26

(...skipping 828 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
855	855

856 if (label.empty())	856 if (label.empty())

857 return false;	857 return false;

858	858

859 *label_to_set = label;	859 *label_to_set = label;

860 *sublabel_to_set = sublabel;	860 *sublabel_to_set = sublabel;

861 *icon_to_set = icon;	861 *icon_to_set = icon;

862 return true;	862 return true;

863 }	863 }

864 } // namespace autofill	864 } // namespace autofill

OLD	NEW