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

chrome/browser/ui/views/autofill/autofill_popup_view_views.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/views/autofill/autofill_popup_view_views.h"
 
 #include "base/optional.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 132 matching lines @@
 * stored autofill info and check for credit card or password forms.
 */
 void AutofillPopupViewViews::DrawAutofillEntry(gfx::Canvas* canvas,
                                                int index,
                                                const gfx::Rect& entry_rect) {
   canvas->FillRect(
       entry_rect,
       GetNativeTheme()->GetSystemColor(
           controller_->GetBackgroundColorIDForRow(index)));
 
-  const bool is_http_warning =
-      (controller_->GetSuggestionAt(index).frontend_id ==
-       POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE);
+  int current_row_frontend_id = controller_->GetSuggestionAt(index).frontend_id;
+  const bool icon_in_front_of_text_row =

[vasilii, 2017/07/06 15:15:21]

icon_in_front_of_text?

[melandory, 2017/07/07 12:26:31]

Done.

+      (current_row_frontend_id ==
+           POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE ||
+       current_row_frontend_id == POPUP_ITEM_ID_ALL_SAVED_PASSWORDS_ENTRY);
   const bool is_rtl = controller_->IsRTL();
   const int text_align =
       is_rtl ? gfx::Canvas::TEXT_ALIGN_RIGHT : gfx::Canvas::TEXT_ALIGN_LEFT;
   gfx::Rect value_rect = entry_rect;
   value_rect.Inset(AutofillPopupLayoutModel::kEndPadding, 0);
 
   // If the icon is on the right of the rect, no matter in RTL or LTR mode.
-  bool icon_on_the_right = is_http_warning == is_rtl;
+  bool icon_on_the_right = icon_in_front_of_text_row == is_rtl;
   int x_align_left = icon_on_the_right ? value_rect.right() : value_rect.x();
 
   // Draw the Autofill icon, if one exists
   int row_height = controller_->layout_model().GetRowBounds(index).height();
   if (!controller_->GetSuggestionAt(index).icon.empty()) {
     const gfx::ImageSkia image =
         controller_->layout_model().GetIconImage(index);
     int icon_y = entry_rect.y() + (row_height - image.height()) / 2;
 
     int icon_x_align_left =
         icon_on_the_right ? x_align_left - image.width() : x_align_left;
 
     canvas->DrawImageInt(image, icon_x_align_left, icon_y);
 
     // An icon was drawn; adjust the |x_align_left| value for the next element.
-    if (is_http_warning) {
-      x_align_left =
-          icon_x_align_left +
-          (is_rtl ? -AutofillPopupLayoutModel::kHttpWarningIconPadding
-                  : image.width() +
-                        AutofillPopupLayoutModel::kHttpWarningIconPadding);
-    } else {
-      x_align_left =
-          icon_x_align_left +
-          (is_rtl ? image.width() + AutofillPopupLayoutModel::kIconPadding
-                  : -AutofillPopupLayoutModel::kIconPadding);
-    }
+    const int width_icon_padding =
+        image.width() +
+        (icon_in_front_of_text_row
+             ? AutofillPopupLayoutModel::kRightHandSideIconPapping

[vasilii, 2017/07/06 15:15:21]

Two questions:
- what is papping?
- Why "right hand side"? it seems to be the padding between the icon and text
for two concrete cases.

[melandory, 2017/07/07 12:26:31]

mistyped padding =)
I wanted to emphasize that it's padding for right hand side icon 

[vasilii, 2017/07/07 12:51:27]

But the icon is actually on the left side

+             : AutofillPopupLayoutModel::kIconPadding);
+    x_align_left = x_align_left + (icon_on_the_right ? -width_icon_padding
+                                                     : width_icon_padding);
   }
 
-  // Draw the value text
+  // Draw the value text.
   const int value_width = gfx::GetStringWidth(
       controller_->GetElidedValueAt(index),
       controller_->layout_model().GetValueFontListForRow(index));
   int value_x_align_left = x_align_left;
 
-  if (is_http_warning) {
+  if (icon_in_front_of_text_row) {
     value_x_align_left += is_rtl ? -value_width : 0;
   } else {
     value_x_align_left =
         is_rtl ? value_rect.right() - value_width : value_rect.x();

[vasilii, 2017/07/06 15:15:21]

The biggest question I have about all of this is
- if (icon_in_front_of_text_row == icon exists) always

If yes then line 197 handles all cases. If no then this line is incorrect as the
text is drawn on top of the icon.

[melandory, 2017/07/07 12:26:31]

It seems so to me for now, I'll get a break and look to it on Monday with fresh
eye and will ask the owner to double check.

[vasilii, 2017/07/07 12:51:27]

Then I think this block can be simplified.

[melandory, 2017/07/10 14:15:14]

There is a view where icon is behind the text:
https://goo.gl/photos/jfpUnxTEHXGt8sJTA 

   }
 
   canvas->DrawStringRectWithFlags(
       controller_->GetElidedValueAt(index),
       controller_->layout_model().GetValueFontListForRow(index),
       GetNativeTheme()->GetSystemColor(
           controller_->layout_model().GetValueFontColorIDForRow(index)),
       gfx::Rect(value_x_align_left, value_rect.y(), value_width,
                 value_rect.height()),
       text_align);
 
   // Draw the label text, if one exists.
   if (!controller_->GetSuggestionAt(index).label.empty()) {
     const int label_width = gfx::GetStringWidth(
         controller_->GetElidedLabelAt(index),
         controller_->layout_model().GetLabelFontListForRow(index));
     int label_x_align_left = x_align_left;
 
-    if (is_http_warning) {
+    if (icon_in_front_of_text_row) {
       label_x_align_left =
           is_rtl ? value_rect.x() : value_rect.right() - label_width;
     } else {
       label_x_align_left += is_rtl ? 0 : -label_width;
     }
 
-    // TODO(crbug.com/678033):Add a GetLabelFontColorForRow function similar to
-    // GetValueFontColorForRow so that the cocoa impl could use it too
+    // TODO(crbug.com/678033): Add a GetLabelFontColorForRow function similar to
+    // GetValueFontColorForRow so that the cocoa impl could use it too.
     canvas->DrawStringRectWithFlags(
         controller_->GetElidedLabelAt(index),
         controller_->layout_model().GetLabelFontListForRow(index),
         GetNativeTheme()->GetSystemColor(
             ui::NativeTheme::kColorId_ResultsTableNormalDimmedText),
         gfx::Rect(label_x_align_left, entry_rect.y(), label_width,
                   entry_rect.height()),
         text_align);
   }
 }
@@ skipping 20 matching lines @@
 
   // If the top level widget can't be found, cancel the popup since we can't
   // fully set it up.
   if (!observing_widget)
     return NULL;
 
   return new AutofillPopupViewViews(controller, observing_widget);
 }
 
 }  // namespace autofill