Http Bad: Add icons to the http warning message

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/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 "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"
+#include "ui/gfx/vector_icons_public.h"
 
 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;
 #endif
 
 const struct {
   const char* name;
   int id;
 } 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)
+    {"httpWarning", IDR_AUTOFILL_HTTP_WARNING},
+    {"httpsInvalid", IDR_AUTOFILL_HTTPS_INVALID_WARNING},
     {"scanCreditCardIcon", IDR_AUTOFILL_CC_SCAN_NEW},
     {"settings", IDR_AUTOFILL_SETTINGS},
 #endif
 };
 
 int GetRowHeightFromId(int identifier) {
   if (identifier == POPUP_ITEM_ID_SEPARATOR)
     return kSeparatorHeight;
 
   return kRowHeight;
@@ skipping 52 matching lines @@
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
 
   int row_size = kEndPadding;
 
   if (with_label)
     row_size += kNamePadding;
 
   // Add the Autofill icon size, if required.
   const base::string16& icon = suggestions[row].icon;
   if (!icon.empty()) {
-    int icon_width = ui::ResourceBundle::GetSharedInstance()
-                         .GetImageNamed(GetIconResourceID(icon))
-                         .Width();
+    int icon_width = GetIconImage(row).width();

[Evan Stade, 2016/11/29 15:23:32]

nit: inline below

[lshang, 2016/11/29 23:48:30]

Done.

     row_size += icon_width + kIconPadding;
   }
 
   // Add the padding at the end.
   row_size += kEndPadding;
 
   // Add room for the popup border.
   row_size += 2 * kPopupBorderThickness;
 
   return row_size;
@@ skipping 51 matching lines @@
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   switch (suggestions[index].frontend_id) {
     case POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE:
       return gfx::kGoogleRed700;
     case POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE:
       return kLabelTextColor;
     default:
       return kValueTextColor;
   }
 }
+
+gfx::ImageSkia AutofillPopupLayoutModel::GetIconImage(size_t index) const {
+  std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
+  base::string16 icon_str = suggestions[index].icon;

[Evan Stade, 2016/11/29 15:23:32]

const ref

[lshang, 2016/11/29 23:48:30]

Done.

+
+  // For http warning message, get icon images from VectorIconId, 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(gfx::VectorIconId::LOCATION_BAR_HTTP,
+                                   kHttpWarningIconWidth, gfx::kChromeIconGrey);
+    }
+    DCHECK(icon_str == base::ASCIIToUTF16("httpsInvalid"));

[Evan Stade, 2016/11/29 15:23:32]

nit: DCHECK_EQ

[lshang, 2016/11/29 23:48:30]

Done.

+    return gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID,
+                                 kHttpWarningIconWidth, gfx::kGoogleRed700);
+  }
+
+  // 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));

[Evan Stade, 2016/11/29 15:23:32]

I believe you have an extra set of parens here

[lshang, 2016/11/29 23:48:30]

Done.

+}
 #endif
 
 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)
@@ skipping 33 matching lines @@
 #endif
 
   return result;
 }
 
 const gfx::Rect AutofillPopupLayoutModel::RoundedElementBounds() const {
   return gfx::ToEnclosingRect(delegate_->element_bounds());
 }
 
 }  // namespace autofill