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" | 5 #include "chrome/browser/ui/android/autofill/autofill_dialog_view_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
10 #include "chrome/browser/ui/android/window_android_helper.h" | 10 #include "chrome/browser/ui/android/window_android_helper.h" |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 Java_AutofillDialogGlue_modelChanged(env, java_object_.obj(), false); | 217 Java_AutofillDialogGlue_modelChanged(env, java_object_.obj(), false); |
218 | 218 |
219 UpdateSection(SECTION_EMAIL); | 219 UpdateSection(SECTION_EMAIL); |
220 UpdateSection(SECTION_CC); | 220 UpdateSection(SECTION_CC); |
221 UpdateSection(SECTION_BILLING); | 221 UpdateSection(SECTION_BILLING); |
222 UpdateSection(SECTION_CC_BILLING); | 222 UpdateSection(SECTION_CC_BILLING); |
223 UpdateSection(SECTION_SHIPPING); | 223 UpdateSection(SECTION_SHIPPING); |
224 } | 224 } |
225 | 225 |
226 void AutofillDialogViewAndroid::SubmitForTesting() { | 226 void AutofillDialogViewAndroid::SubmitForTesting() { |
227 controller_->OnSubmit(); | 227 controller_->OnAccept(); |
228 } | 228 } |
229 | 229 |
230 void AutofillDialogViewAndroid::CancelForTesting() { | 230 void AutofillDialogViewAndroid::CancelForTesting() { |
231 controller_->OnCancel(); | 231 controller_->OnCancel(); |
232 } | 232 } |
233 | 233 |
234 // Calls from Java to C++ | 234 // Calls from Java to C++ |
235 | 235 |
236 void AutofillDialogViewAndroid::ItemSelected(JNIEnv* env, jobject obj, | 236 void AutofillDialogViewAndroid::ItemSelected(JNIEnv* env, jobject obj, |
237 jint section, jint index) { | 237 jint section, jint index) { |
(...skipping 21 matching lines...) Expand all Loading... |
259 } | 259 } |
260 | 260 |
261 void AutofillDialogViewAndroid::EditingCancel(JNIEnv* env, jobject obj, | 261 void AutofillDialogViewAndroid::EditingCancel(JNIEnv* env, jobject obj, |
262 jint section) { | 262 jint section) { |
263 // TODO(aruslan): start using this call. | 263 // TODO(aruslan): start using this call. |
264 NOTIMPLEMENTED(); | 264 NOTIMPLEMENTED(); |
265 } | 265 } |
266 | 266 |
267 void AutofillDialogViewAndroid::DialogSubmit(JNIEnv* env, jobject obj) { | 267 void AutofillDialogViewAndroid::DialogSubmit(JNIEnv* env, jobject obj) { |
268 // TODO(aurimas): add validation step. | 268 // TODO(aurimas): add validation step. |
269 controller_->OnSubmit(); | 269 controller_->OnAccept(); |
270 } | 270 } |
271 | 271 |
272 void AutofillDialogViewAndroid::DialogCancel(JNIEnv* env, jobject obj) { | 272 void AutofillDialogViewAndroid::DialogCancel(JNIEnv* env, jobject obj) { |
273 controller_->OnCancel(); | 273 controller_->OnCancel(); |
274 } | 274 } |
275 | 275 |
276 // static | 276 // static |
277 bool AutofillDialogViewAndroid::RegisterAutofillDialogViewAndroid(JNIEnv* env) { | 277 bool AutofillDialogViewAndroid::RegisterAutofillDialogViewAndroid(JNIEnv* env) { |
278 return RegisterNativesImpl(env); | 278 return RegisterNativesImpl(env); |
279 } | 279 } |
280 | 280 |
281 } // namespace autofill | 281 } // namespace autofill |
OLD | NEW |