rAc: try really hard not to ellipsize addresses

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"
@@ skipping 322 matching lines @@
       static_cast<DialogNotification::Type>(type),
       static_cast<bool>(checked));
 }
 
 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()) {
+  if (!suggestion_state.show) {
     // The section is already in the editing mode, or it's the "Add...".
     return;
   }
 
   controller_->EditClickedForSection(section);
   UpdateOrFillSectionToJava(section, false, UNKNOWN_TYPE);
 }
 
 jboolean AutofillDialogViewAndroid::EditingComplete(JNIEnv* env,
                                                     jobject obj,
@@ skipping 214 matching lines @@
     ScopedJavaLocalRef<jobject> icon = GetJavaBitmap(icon_value);
 
     Java_AutofillDialogGlue_addToAutofillDialogMenuItemArray(
         env, menu_array.obj(), i,
         line1.obj(), line2.obj(), icon.obj(),
         static_cast<int>(button_type));
   }
 
   const SuggestionState& suggestion_state =
       controller_->SuggestionStateForSection(section);
+  // TODO(estade): also make use of |horizontally_compact_text|.
   ScopedJavaLocalRef<jstring> suggestion_text =
-      base::android::ConvertUTF16ToJavaString(env, suggestion_state.text);
+      base::android::ConvertUTF16ToJavaString(
+      env, suggestion_state.vertically_compact_text);
   ScopedJavaLocalRef<jstring> suggestion_text_extra =
       base::android::ConvertUTF16ToJavaString(env, suggestion_state.extra_text);
   ScopedJavaLocalRef<jobject> suggestion_icon =
       GetJavaBitmap(suggestion_state.icon);
   ScopedJavaLocalRef<jobject> suggestion_icon_extra =
       GetJavaBitmap(suggestion_state.extra_icon);
 
   Java_AutofillDialogGlue_updateSection(env,
                                         java_object_.obj(),
                                         section,
@@ skipping 197 matching lines @@
 // Returns true and fills in the |label|, |sublabel| and |icon if
 // a given |section| has the user input.
 // TODO(aruslan): Remove/fix this once http://crbug.com/230685 is closed.
 bool AutofillDialogViewAndroid::CollapseUserDataIntoMenuItem(
     DialogSection section,
     string16* label_to_set,
     string16* sublabel_to_set,
     gfx::Image* icon_to_set) const {
   const SuggestionState& suggestion_state =
       controller_->SuggestionStateForSection(section);
-  if (!suggestion_state.text.empty())
+  if (suggestion_state.show)
     return false;
 
   DetailOutputMap inputs;
   GetUserInputImpl(section, &inputs);
 
   string16 label;
   string16 sublabel;
   gfx::Image icon;
 
   switch (section) {
@@ skipping 14 matching lines @@
       sublabel = pw.GetSublabel();
       break;
     }
 
     case SECTION_CC_BILLING: {
       CreditCard card;
       AutofillProfile profile;
       GetBillingInfoFromOutputs(inputs, &card, &profile);
       AutofillCreditCardWrapper ccw(&card);
       CollapsedAutofillProfileWrapper pw(&profile);
-      label = ccw.GetDisplayText();
+      base::string16 unused;
+      ccw.GetDisplayText(&label, &unused);
       sublabel = pw.GetDisplayText();
       icon = ccw.GetIcon();
       break;
     }
 
     case SECTION_SHIPPING: {
       AutofillProfile profile;
       GetBillingInfoFromOutputs(inputs, NULL, &profile);
       CollapsedAutofillProfileWrapper pw(&profile);
       label = pw.GetDisplayText();
@@ skipping 13 matching lines @@
 
   if (label.empty())
     return false;
 
   *label_to_set = label;
   *sublabel_to_set = sublabel;
   *icon_to_set = icon;
   return true;
 }
 }  // namespace autofill