chrome/browser/ui/android/autofill/autofill_dialog_view_android.h - Issue 14129005: Remove "Use billing for shipping" checkbox in favor of item in suggestions menu.

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

Issue 14129005: Remove "Use billing for shipping" checkbox in favor of item in suggestions menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 7 years, 8 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

« chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialog.java ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc » ('j') | chrome/browser/ui/autofill/autofill_dialog_controller_impl.h » ('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 #ifndef CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_DIALOG_VIEW_ANDROID_H_	5 #ifndef CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_DIALOG_VIEW_ANDROID_H_

6 #define CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_DIALOG_VIEW_ANDROID_H_	6 #define CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_DIALOG_VIEW_ANDROID_H_

7	7

8 #include <jni.h>	8 #include <jni.h>

9	9

10 #include "base/android/jni_string.h"	10 #include "base/android/jni_string.h"

(...skipping 14 matching lines...) Expand all Loading...
25 virtual void Show() OVERRIDE;	25 virtual void Show() OVERRIDE;

26 virtual void Hide() OVERRIDE;	26 virtual void Hide() OVERRIDE;

27 virtual void UpdateNotificationArea() OVERRIDE;	27 virtual void UpdateNotificationArea() OVERRIDE;

28 virtual void UpdateAccountChooser() OVERRIDE;	28 virtual void UpdateAccountChooser() OVERRIDE;

29 virtual void UpdateButtonStrip() OVERRIDE;	29 virtual void UpdateButtonStrip() OVERRIDE;

30 virtual void UpdateSection(DialogSection section,	30 virtual void UpdateSection(DialogSection section,

31 UserInputAction action) OVERRIDE;	31 UserInputAction action) OVERRIDE;

32 virtual void GetUserInput(DialogSection section,	32 virtual void GetUserInput(DialogSection section,

33 DetailOutputMap* output) OVERRIDE;	33 DetailOutputMap* output) OVERRIDE;

34 virtual string16 GetCvc() OVERRIDE;	34 virtual string16 GetCvc() OVERRIDE;

35 virtual bool UseBillingForShipping() OVERRIDE;

36 virtual bool SaveDetailsLocally() OVERRIDE;	35 virtual bool SaveDetailsLocally() OVERRIDE;

37 virtual const content::NavigationController* ShowSignIn() OVERRIDE;	36 virtual const content::NavigationController* ShowSignIn() OVERRIDE;

38 virtual void HideSignIn() OVERRIDE;	37 virtual void HideSignIn() OVERRIDE;

39 virtual void UpdateProgressBar(double value) OVERRIDE;	38 virtual void UpdateProgressBar(double value) OVERRIDE;

40 virtual void ModelChanged() OVERRIDE;	39 virtual void ModelChanged() OVERRIDE;

41 virtual void SubmitForTesting() OVERRIDE;	40 virtual void SubmitForTesting() OVERRIDE;

42 virtual void CancelForTesting() OVERRIDE;	41 virtual void CancelForTesting() OVERRIDE;

43	42

44 // Java to C++ calls	43 // Java to C++ calls

45 void ItemSelected(JNIEnv* env, jobject obj, jint section, jint index);	44 void ItemSelected(JNIEnv* env, jobject obj, jint section, jint index);

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92	91

93 // The corresponding java object.	92 // The corresponding java object.

94 base::android::ScopedJavaGlobalRef<jobject> java_object_;	93 base::android::ScopedJavaGlobalRef<jobject> java_object_;

95	94

96 DISALLOW_COPY_AND_ASSIGN(AutofillDialogViewAndroid);	95 DISALLOW_COPY_AND_ASSIGN(AutofillDialogViewAndroid);

97 };	96 };

98	97

99 } // namespace autofill	98 } // namespace autofill

100	99

101 #endif // CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_DIALOG_VIEW_ANDROID_H_	100 #endif // CHROME_BROWSER_UI_ANDROID_AUTOFILL_AUTOFILL_DIALOG_VIEW_ANDROID_H_

OLD	NEW