Better error reasons for rAc

chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 124 matching lines @@
 }
 
 }  // namespace
 
 
 // static
 base::WeakPtr<AutofillDialogController> AutofillDialogControllerAndroid::Create(
     content::WebContents* contents,
     const FormData& form_structure,
     const GURL& source_url,
-    const base::Callback<void(const FormStructure*)>& callback) {
+    const AutofillManagerDelegate::ResultCallback& callback) {
   // AutofillDialogControllerAndroid owns itself.
   AutofillDialogControllerAndroid* autofill_dialog_controller =
       new AutofillDialogControllerAndroid(contents,
                                           form_structure,
                                           source_url,
                                           callback);
   return autofill_dialog_controller->weak_ptr_factory_.GetWeakPtr();
 }
 
 #if defined(ENABLE_AUTOFILL_DIALOG)
 // static
 base::WeakPtr<AutofillDialogController>
 AutofillDialogController::Create(
     content::WebContents* contents,
     const FormData& form_structure,
     const GURL& source_url,
-    const base::Callback<void(const FormStructure*)>& callback) {
+    const AutofillManagerDelegate::ResultCallback& callback) {
   return AutofillDialogControllerAndroid::Create(contents,
                                                  form_structure,
                                                  source_url,
                                                  callback);
 }
 
 // static
 void AutofillDialogController::RegisterPrefs(PrefRegistrySimple* registry) {}
 
 // static
@@ skipping 26 matching lines @@
   bool has_sections = false;
   form_structure_.ParseFieldTypesFromAutocompleteAttributes(
       &has_types, &has_sections);
 
   // Fail if the author didn't specify autocomplete types, or
   // if the dialog shouldn't be shown in a given circumstances.
   if (!has_types ||
       !Java_AutofillDialogControllerAndroid_isDialogAllowed(
           env,
           invoked_from_same_origin_)) {
-    callback_.Run(NULL);
+    callback_.Run(AutofillManagerDelegate::AutocompleteResultErrorUnsupported,
+                  NULL);
     delete this;
     return;
   }
 
   // Log any relevant UI metrics and security exceptions.
   GetMetricLogger().LogDialogUiEvent(AutofillMetrics::DIALOG_UI_SHOWN);
 
   GetMetricLogger().LogDialogSecurityMetric(
       AutofillMetrics::SECURITY_METRIC_DIALOG_SHOWN);
 
@@ skipping 97 matching lines @@
 
 // static
 bool AutofillDialogControllerAndroid::
     RegisterAutofillDialogControllerAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void AutofillDialogControllerAndroid::DialogCancel(JNIEnv* env,
                                                    jobject obj) {
   LogOnCancelMetrics();
-  callback_.Run(NULL);
+  callback_.Run(AutofillManagerDelegate::AutocompleteResultErrorCancel,
+                NULL);
 }
 
 void AutofillDialogControllerAndroid::DialogContinue(
     JNIEnv* env,
     jobject obj,
     jobject wallet,
     jboolean jlast_used_choice_is_autofill,
     jstring jlast_used_account_name,
     jstring jlast_used_billing,
     jstring jlast_used_shipping,
@@ skipping 35 matching lines @@
       if (!last_used_card.empty())
         defaults->SetString(kLastUsedCreditCardGuid, last_used_card);
     } else {
       LOG(ERROR) << "Failed to save AutofillDialog preferences";
     }
   }
 
   LogOnFinishSubmitMetrics();
 
   // Callback should be called as late as possible.
-  callback_.Run(&form_structure_);
+  callback_.Run(AutofillManagerDelegate::AutocompleteResultSuccess,
+                &form_structure_);
 
   // This might delete us.
   Hide();
 }
 
 AutofillDialogControllerAndroid::AutofillDialogControllerAndroid(
     content::WebContents* contents,
     const FormData& form_structure,
     const GURL& source_url,
-    const base::Callback<void(const FormStructure*)>& callback)
+    const AutofillManagerDelegate::ResultCallback& callback)
     : profile_(Profile::FromBrowserContext(contents->GetBrowserContext())),
       contents_(contents),
       initial_user_state_(AutofillMetrics::DIALOG_USER_STATE_UNKNOWN),
       form_structure_(form_structure),
       invoked_from_same_origin_(true),
       source_url_(source_url),
       callback_(callback),
       cares_about_shipping_(true),
       weak_ptr_factory_(this),
       was_ui_latency_logged_(false) {
@@ skipping 10 matching lines @@
 
 void AutofillDialogControllerAndroid::LogOnCancelMetrics() {
   GetMetricLogger().LogDialogUiDuration(
       base::Time::Now() - dialog_shown_timestamp_,
       AutofillMetrics::DIALOG_CANCELED);
 
   GetMetricLogger().LogDialogUiEvent(AutofillMetrics::DIALOG_UI_CANCELED);
 }
 
 }  // namespace autofill