Skeleton for showing "Show all saved passwords row" for Linux/CrOs/Windows platforms

chrome/browser/ui/autofill/autofill_popup_layout_model.cc

 // Copyright (c) 2016 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_layout_model.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "components/autofill/core/browser/autofill_experiments.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "components/grit/components_scaled_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 
 #if !defined(OS_ANDROID)
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "components/toolbar/vector_icons.h"  // nogncheck
 #endif
 
 namespace autofill {
 
 namespace {
 
 // 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)
 // Size difference between the normal font and the smaller font, in pixels.
 const int kSmallerFontSizeDelta = -1;
 
-const int kHttpWarningIconWidth = 16;
+const int kRowWithLeftHandsideIcon = 16;

[vasilii, 2017/07/13 16:11:51]

Confusing. The name shouldn't include 'Row' but should include "width"

[Evan Stade, 2017/07/13 16:48:43]

I would define this in the one function where it's relevant and just call it
kIconSize

[melandory, 2017/07/25 15:08:49]

Done.

 #endif
 
 const struct {
   const char* name;
   int id;
 } kDataResources[] = {
     {autofill::kAmericanExpressCard, IDR_AUTOFILL_CC_AMEX},
     {autofill::kDinersCard, IDR_AUTOFILL_CC_DINERS},
     {autofill::kDiscoverCard, IDR_AUTOFILL_CC_DISCOVER},
     {autofill::kEloCard, IDR_AUTOFILL_CC_ELO},
@@ skipping 46 matching lines @@
 }
 
 int AutofillPopupLayoutModel::GetDesiredPopupWidth() const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
 
   int popup_width = RoundedElementBounds().width();
 
   for (size_t i = 0; i < suggestions.size(); ++i) {
     int label_size = delegate_->GetElidedLabelWidthForRow(i);
     int row_size = delegate_->GetElidedValueWidthForRow(i) + label_size +
-                   RowWidthWithoutText(i, /* with_label= */ label_size > 0);
+                   RowWidthWithoutText(i, /* has_substext= */ label_size > 0);
 
     popup_width = std::max(popup_width, row_size);
   }
 
   return popup_width;
 }
 
 int AutofillPopupLayoutModel::RowWidthWithoutText(int row,
-                                                  bool with_label) const {
+                                                  bool has_substext) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   bool is_warning_message = (suggestions[row].frontend_id ==
                              POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE);
+  const bool is_row_with_icon_positioned_at_start =
+      (is_warning_message || (suggestions[row].frontend_id ==
+                              POPUP_ITEM_ID_ALL_SAVED_PASSWORDS_ENTRY));
 
-  int row_size = kEndPadding;
-
-  if (with_label)
+  int row_size = 2 * (kEndPadding + kPopupBorderThickness);
+  if (has_substext) {
     row_size += is_warning_message ? kHttpWarningNamePadding : kNamePadding;
+  }

[Evan Stade, 2017/07/13 16:48:43]

nit: no curlies

[melandory, 2017/07/25 15:08:49]

Done.

 
   // Add the Autofill icon size, if required.
   const base::string16& icon = suggestions[row].icon;
   if (!icon.empty()) {
-    row_size += GetIconImage(row).width() +
-                (is_warning_message ? kHttpWarningIconPadding : kIconPadding);
+    row_size +=
+        GetIconImage(row).width() + (is_row_with_icon_positioned_at_start
+                                         ? kPaddingBetweenLeftSideIconAndText
+                                         : kIconPadding);
   }
-
-  // Add the padding at the end.
-  row_size += kEndPadding;
-
-  // Add room for the popup border.
-  row_size += 2 * kPopupBorderThickness;
-
   return row_size;
 }
 
 int AutofillPopupLayoutModel::GetAvailableWidthForRow(int row,
-                                                      bool with_label) const {
-  return popup_bounds_.width() - RowWidthWithoutText(row, with_label);
+                                                      bool has_substext) const {
+  return popup_bounds_.width() - RowWidthWithoutText(row, has_substext);
 }
 
 void AutofillPopupLayoutModel::UpdatePopupBounds() {
   int popup_width = GetDesiredPopupWidth();
   int popup_height = GetDesiredPopupHeight();
 
   popup_bounds_ = view_common_.CalculatePopupBounds(
       popup_width, popup_height, RoundedElementBounds(),
       delegate_->container_view(), delegate_->IsRTL());
 }
@@ skipping 12 matching lines @@
     case POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE:
     case POPUP_ITEM_ID_CLEAR_FORM:
     case POPUP_ITEM_ID_CREDIT_CARD_SIGNIN_PROMO:
     case POPUP_ITEM_ID_AUTOFILL_OPTIONS:
     case POPUP_ITEM_ID_CREATE_HINT:
     case POPUP_ITEM_ID_SCAN_CREDIT_CARD:
     case POPUP_ITEM_ID_SEPARATOR:
     case POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE:
     case POPUP_ITEM_ID_TITLE:
     case POPUP_ITEM_ID_PASSWORD_ENTRY:
+    case POPUP_ITEM_ID_ALL_SAVED_PASSWORDS_ENTRY:
       return normal_font_list_;
     case POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY:
     case POPUP_ITEM_ID_DATALIST_ENTRY:
     case POPUP_ITEM_ID_USERNAME_ENTRY:
       return bold_font_list_;
   }
   NOTREACHED();
   return normal_font_list_;
 }
 
@@ skipping 19 matching lines @@
       return ui::NativeTheme::kColorId_ResultsTableNormalText;
   }
 }
 
 gfx::ImageSkia AutofillPopupLayoutModel::GetIconImage(size_t index) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   const base::string16& icon_str = suggestions[index].icon;
 
   // For http warning message, get icon images from VectorIcon, which is the
   // same as security indicator icons in location bar.
-  if (suggestions[index].frontend_id ==
-      POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE) {
-    if (icon_str == base::ASCIIToUTF16("httpWarning")) {
-      return gfx::CreateVectorIcon(toolbar::kHttpIcon, kHttpWarningIconWidth,
-                                   gfx::kChromeIconGrey);
-    }
-    DCHECK_EQ(icon_str, base::ASCIIToUTF16("httpsInvalid"));
+  if (icon_str == base::ASCIIToUTF16("httpWarning")) {
+    return gfx::CreateVectorIcon(toolbar::kHttpIcon, kRowWithLeftHandsideIcon,
+                                 gfx::kChromeIconGrey);
+  }
+  if (icon_str == base::ASCIIToUTF16("httpsInvalid")) {
     return gfx::CreateVectorIcon(toolbar::kHttpsInvalidIcon,
-                                 kHttpWarningIconWidth, gfx::kGoogleRed700);
+                                 kRowWithLeftHandsideIcon, gfx::kGoogleRed700);
+  }
+
+  if (icon_str == base::ASCIIToUTF16("showAllSavedPasswords")) {
+    return gfx::CreateVectorIcon(kShowAllSavedPasswordsIcon,
+                                 kRowWithLeftHandsideIcon,
+                                 gfx::kChromeIconGrey);
   }
 
   // For other suggestion entries, get icon from PNG files.
   int icon_id = GetIconResourceID(icon_str);
   DCHECK_NE(-1, icon_id);
   return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon_id);
 }
-#endif
+#endif  // !defined(OS_ANDROID)
 
 int AutofillPopupLayoutModel::LineFromY(int y) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   int current_height = kPopupBorderThickness;
 
   for (size_t i = 0; i < suggestions.size(); ++i) {
     current_height += GetRowHeightFromId(suggestions[i].frontend_id);
 
     if (y <= current_height)
       return i;
@@ skipping 55 matching lines @@
 bool AutofillPopupLayoutModel::IsIconAtStart(int frontend_id) const {
   return frontend_id == POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE ||
       (is_credit_card_popup_ && IsIconInCreditCardPopupAtStart());
 }
 
 unsigned int AutofillPopupLayoutModel::GetMargin() const {
   return GetPopupMargin();
 }
 
 }  // namespace autofill