Revert 195316 "Remove "Use billing for shipping" checkbox in fav..."

trunk/src/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc

 // Copyright (c) 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_view_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"
 #include "base/utf_string_conversions.h"
@@ skipping 19 matching lines @@
 // AutofillDialogView ----------------------------------------------------------
 
 AutofillDialogViewAndroid::AutofillDialogViewAndroid(
     AutofillDialogController* controller)
     : controller_(controller) {}
 
 AutofillDialogViewAndroid::~AutofillDialogViewAndroid() {}
 
 void AutofillDialogViewAndroid::Show() {
   JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jstring> use_billing_for_shipping_text =
+      base::android::ConvertUTF16ToJavaString(
+          env, controller_->UseBillingForShippingText());
   ScopedJavaLocalRef<jstring> save_locally_text =
         base::android::ConvertUTF16ToJavaString(
             env, controller_->SaveLocallyText());
   java_object_.Reset(Java_AutofillDialogGlue_create(
       env,
       reinterpret_cast<jint>(this),
       WindowAndroidHelper::FromWebContents(controller_->web_contents())->
           GetWindowAndroid()->GetJavaObject().obj(),
+      use_billing_for_shipping_text.obj(),
       save_locally_text.obj()));
 }
 
 void AutofillDialogViewAndroid::Hide() {
   NOTIMPLEMENTED();
 }
 
 void AutofillDialogViewAndroid::UpdateNotificationArea() {
   JNIEnv* env = base::android::AttachCurrentThread();
   std::vector<DialogNotification> notifications =
@@ skipping 150 matching lines @@
       env, java_object_.obj(), controller_->ShouldOfferToSaveInChrome());
 }
 
 string16 AutofillDialogViewAndroid::GetCvc() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> cvc =
       Java_AutofillDialogGlue_getCvc(env, java_object_.obj());
   return base::android::ConvertJavaStringToUTF16(env, cvc.obj());
 }
 
+bool AutofillDialogViewAndroid::UseBillingForShipping() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  return Java_AutofillDialogGlue_shouldUseBillingForShipping(
+      env, java_object_.obj());
+}
+
 bool AutofillDialogViewAndroid::SaveDetailsLocally() {
   JNIEnv* env = base::android::AttachCurrentThread();
   return Java_AutofillDialogGlue_shouldSaveDetailsLocally(env,
                                                           java_object_.obj());
 }
 
 const content::NavigationController* AutofillDialogViewAndroid::ShowSignIn() {
   NOTIMPLEMENTED();
   return NULL;
 }
@@ skipping 88 matching lines @@
   ui::MenuModel* model = controller_->MenuModelForAccountChooser();
   if (!model)
     return;
 
   model->ActivatedAt(index);
 }
 
 void AutofillDialogViewAndroid::EditingStart(JNIEnv* env, jobject obj,
                                              jint jsection) {
   const DialogSection section = static_cast<DialogSection>(jsection);
-  // TODO(estade): respect |suggestion_state.text_style|.
   const SuggestionState& suggestion_state =
       controller_->SuggestionStateForSection(section);
   if (suggestion_state.text.empty()) {
     // The section is already in the editing mode, or it's the "Add...".
     return;
   }
 
   controller_->EditClickedForSection(section);
 }
 
@@ skipping 110 matching lines @@
         env, error_array.obj(), i, invalid_inputs[i], error_text.obj());
   }
   Java_AutofillDialogGlue_updateSectionErrors(env,
                                               java_object_.obj(),
                                               section,
                                               error_array.obj());
   return false;
 }
 
 }  // namespace autofill