Enable GetValueFontListForRow and GetLabelFontList in AutofillPopupController for aura Android

chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

 // Copyright (c) 2012 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/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 22 matching lines @@
 
 // Used to indicate that no line is currently selected by the user.
 const int kNoSelection = -1;
 
 // The vertical height of each row in pixels.
 const size_t kRowHeight = 24;
 
 // The vertical height of a separator in pixels.
 const size_t kSeparatorHeight = 1;
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
 // Size difference between name and label in pixels.
 const int kLabelFontSizeDelta = -2;
 
 const size_t kNamePadding = AutofillPopupView::kNamePadding;
 const size_t kIconPadding = AutofillPopupView::kIconPadding;
 const size_t kEndPadding = AutofillPopupView::kEndPadding;
 #endif
 
 struct DataResource {
   const char* name;
   int id;
 };
 
 const DataResource kDataResources[] = {
   { "americanExpressCC", IDR_AUTOFILL_CC_AMEX },
   { "dinersCC", IDR_AUTOFILL_CC_GENERIC },
   { "discoverCC", IDR_AUTOFILL_CC_DISCOVER },
   { "genericCC", IDR_AUTOFILL_CC_GENERIC },
   { "jcbCC", IDR_AUTOFILL_CC_GENERIC },
   { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD },
   { "visaCC", IDR_AUTOFILL_CC_VISA },
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   { "scanCreditCardIcon", IDR_AUTOFILL_CC_SCAN_NEW },
   { "settings", IDR_AUTOFILL_SETTINGS },
 #endif
 };
 
 }  // namespace
 
 // static
 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate(
     WeakPtr<AutofillPopupControllerImpl> previous,
@@ skipping 30 matching lines @@
                                                    text_direction,
                                                    container_view,
                                                    web_contents)),
       view_(NULL),
       delegate_(delegate),
       weak_ptr_factory_(this) {
   ClearState();
   controller_common_->SetKeyPressCallback(
       base::Bind(&AutofillPopupControllerImpl::HandleKeyPressEvent,
                  base::Unretained(this)));
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
   label_font_list_ = value_font_list_.DeriveWithSizeDelta(kLabelFontSizeDelta);
   title_font_list_ = value_font_list_.DeriveWithStyle(gfx::Font::BOLD);
 #if defined(OS_MACOSX)
   // There is no italic version of the system font.
   warning_font_list_ = value_font_list_;
 #else
   warning_font_list_ = value_font_list_.DeriveWithStyle(gfx::Font::ITALIC);
 #endif
 #endif
 }
 
 AutofillPopupControllerImpl::~AutofillPopupControllerImpl() {}
 
 void AutofillPopupControllerImpl::Show(
     const std::vector<autofill::Suggestion>& suggestions) {
   SetValues(suggestions);
   DCHECK_EQ(suggestions_.size(), elided_values_.size());
   DCHECK_EQ(suggestions_.size(), elided_labels_.size());
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
   // Android displays the long text with ellipsis using the view attributes.
 
   UpdatePopupBounds();
   int popup_width = popup_bounds().width();
 
   // Elide the name and label strings so that the popup fits in the available
   // space.
   for (size_t i = 0; i < suggestions_.size(); ++i) {
     int value_width =
         gfx::GetStringWidth(suggestions_[i].value, GetValueFontListForRow(i));
@@ skipping 156 matching lines @@
       AcceptSelectedLine();
       return false;
     case ui::VKEY_RETURN:
       return AcceptSelectedLine();
     default:
       return false;
   }
 }
 
 void AutofillPopupControllerImpl::UpdateBoundsAndRedrawPopup() {
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
   // TODO(csharp): Since UpdatePopupBounds can change the position of the popup,
   // the popup could end up jumping from above the element to below it.
   // It is unclear if it is better to keep the popup where it was, or if it
   // should try and move to its desired position.
   UpdatePopupBounds();
 #endif
 
   view_->UpdateBoundsAndRedrawPopup();
 }
 
@@ skipping 28 matching lines @@
 int AutofillPopupControllerImpl::GetIconResourceID(
     const base::string16& resource_name) const {
   int result = -1;
   for (size_t i = 0; i < arraysize(kDataResources); ++i) {
     if (resource_name == base::ASCIIToUTF16(kDataResources[i].name)) {
       result = kDataResources[i].id;
       break;
     }
   }
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   if (result == IDR_AUTOFILL_CC_SCAN_NEW && IsKeyboardAccessoryEnabled())
     result = IDR_AUTOFILL_CC_SCAN_NEW_KEYBOARD_ACCESSORY;
-#endif  // OS_ANDROID
+#endif
 
   return result;
 }
 
 bool AutofillPopupControllerImpl::IsWarning(size_t index) const {
   return suggestions_[index].frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE;
 }
 
 gfx::Rect AutofillPopupControllerImpl::GetRowBounds(size_t index) {
   int top = kPopupBorderThickness;
@@ skipping 77 matching lines @@
   if (HasSuggestions()) {
     delegate_->ClearPreviewedForm();
     UpdateBoundsAndRedrawPopup();
   } else {
     Hide();
   }
 
   return true;
 }
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
 const gfx::FontList& AutofillPopupControllerImpl::GetValueFontListForRow(
     size_t index) const {
   if (suggestions_[index].frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE)
     return warning_font_list_;
 
   if (suggestions_[index].frontend_id == POPUP_ITEM_ID_TITLE)
     return title_font_list_;
 
   return value_font_list_;
 }
@@ skipping 122 matching lines @@
 void AutofillPopupControllerImpl::ShowView() {
   view_->Show();
 }
 
 void AutofillPopupControllerImpl::InvalidateRow(size_t row) {
   DCHECK(0 <= row);
   DCHECK(row < suggestions_.size());
   view_->InvalidateRow(row);
 }
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
 int AutofillPopupControllerImpl::GetDesiredPopupWidth() const {
   int popup_width = controller_common_->RoundedElementBounds().width();
   for (size_t i = 0; i < GetLineCount(); ++i) {
     int row_size =
         gfx::GetStringWidth(GetElidedValueAt(i), value_font_list_) +
         gfx::GetStringWidth(GetElidedLabelAt(i), label_font_list_) +
         RowWidthWithoutText(i);
 
     popup_width = std::max(popup_width, row_size);
   }
@@ skipping 33 matching lines @@
 
   return row_size;
 }
 
 void AutofillPopupControllerImpl::UpdatePopupBounds() {
   int popup_width = GetDesiredPopupWidth();
   int popup_height = GetDesiredPopupHeight();
 
   popup_bounds_ = controller_common_->GetPopupBounds(popup_width, popup_height);
 }
-#endif  // !defined(OS_ANDROID)
+#endif

[mfomitchev, 2015/11/16 22:45:32]

nit: When the ifdef spawns a few dozen lines like here, the comment at #endif
could be valuable, so I'd update the comment in this case rather than remove it.

[bshe, 2015/11/17 17:03:23]

The problem of comment is that it could be easily out of date, which may make
the situation even worse. That's why I decide to remove it instead of update it.
But if you have strong opinion on this. I can update the comment.

 
 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void AutofillPopupControllerImpl::ClearState() {
   // Don't clear view_, because otherwise the popup will have to get regenerated
   // and this will cause flickering.
 
   popup_bounds_ = gfx::Rect();
 
   suggestions_.clear();
   elided_values_.clear();
   elided_labels_.clear();
 
   selected_line_ = kNoSelection;
 }
 
 }  // namespace autofill