Style the Form-Not-Secure warning on Mac

chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h"
 
 #include "base/logging.h"
+#include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 
 using autofill::AutofillPopupView;
 using autofill::AutofillPopupLayoutModel;
 
 @interface AutofillPopupViewCocoa ()
 
 #pragma mark -
 #pragma mark Private methods
 
 // Draws an Autofill suggestion in the given |bounds|, labeled with the given
@@ skipping 113 matching lines @@
 
 #pragma mark -
 #pragma mark Private API:
 
 - (void)drawSuggestionWithName:(NSString*)name
                        subtext:(NSString*)subtext
                          index:(size_t)index
                         bounds:(NSRect)bounds
                       selected:(BOOL)isSelected
                    textYOffset:(CGFloat)textYOffset {
+  BOOL isHTTPWarning =
+      (controller_->GetSuggestionAt(index).frontend_id ==
+       autofill::POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE);
+
   // If this row is selected, highlight it with this mac system color.
   // Otherwise the controller may have a specific background color for this
   // entry.
   if (isSelected) {
     [[self highlightColor] set];
     [NSBezierPath fillRect:bounds];
   } else {
     SkColor backgroundColor = controller_->GetBackgroundColorForRow(index);
     [skia::SkColorToSRGBNSColor(backgroundColor) set];
     [NSBezierPath fillRect:bounds];
   }
 
   BOOL isRTL = controller_->IsRTL();
 
   // The X values of the left and right borders of the autofill widget.
   CGFloat leftX = NSMinX(bounds) + AutofillPopupLayoutModel::kEndPadding;
   CGFloat rightX = NSMaxX(bounds) - AutofillPopupLayoutModel::kEndPadding;
 
   // Draw left side if isRTL == NO, right side if isRTL == YES.
   CGFloat x = isRTL ? rightX : leftX;
+  if (isHTTPWarning) {
+    x = [self drawIconAtIndex:index atX:x rightAlign:isRTL bounds:bounds];
+  }
   [self drawName:name
               atX:x
             index:index
        rightAlign:isRTL
            bounds:bounds
       textYOffset:textYOffset];
 
   // Draw right side if isRTL == NO, left side if isRTL == YES.
   x = isRTL ? leftX : rightX;
-  x = [self drawIconAtIndex:index atX:x rightAlign:!isRTL bounds:bounds];
+  if (!isHTTPWarning) {
+    x = [self drawIconAtIndex:index atX:x rightAlign:!isRTL bounds:bounds];
+  }
   [self drawSubtext:subtext
                 atX:x
               index:index
          rightAlign:!isRTL
              bounds:bounds
         textYOffset:textYOffset];
 }
 
 - (CGFloat)drawName:(NSString*)name
                 atX:(CGFloat)x
@@ skipping 60 matching lines @@
   x -= rightAlign ? subtextSize.width : 0;
   CGFloat y = bounds.origin.y + (bounds.size.height - subtextSize.height) / 2;
   y += textYOffset;
 
   [subtext drawAtPoint:NSMakePoint(x, y) withAttributes:subtextAttributes];
   x += rightAlign ? 0 : subtextSize.width;
   return x;
 }
 
 - (NSImage*)iconAtIndex:(size_t)index {
+  const int kHttpWarningIconWidth = 16;
   const base::string16& icon = controller_->GetSuggestionAt(index).icon;
   if (icon.empty())
     return nil;
 
+  // For the Form-Not-Secure warning about password/credit card fields on HTTP
+  // pages, reuse the omnibox vector icons.
+  if (icon == base::ASCIIToUTF16("httpWarning")) {

[Mathieu, 2017/01/05 20:37:18]

could you try removing
https://cs.chromium.org/chromium/src/chrome/browser/ui/autofill/autofill_popu...
and 59? it seems we are not really getting the image resources for these and
rather using vectors on all platforms.

[estark, 2017/01/05 21:24:45]

I think we use rely on those lines on Android, no?
https://cs.chromium.org/chromium/src/chrome/browser/ui/android/autofill/autof...

[Robert Sesek, 2017/01/06 22:28:10]

Is there not a constant for this available?

[estark, 2017/01/07 03:34:40]

Hmm, doesn't appear to be; these icons are selected via string literals
throughout the autofill code (see the uses of
https://cs.chromium.org/chromium/src/components/autofill/core/browser/suggest...
and also
https://cs.chromium.org/chromium/src/chrome/browser/ui/autofill/autofill_popu...)

+    return NSImageFromImageSkiaWithColorSpace(
+        gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTP,
+                              kHttpWarningIconWidth, gfx::kChromeIconGrey),
+        base::mac::GetSRGBColorSpace());
+  }
+
+  if (icon == base::ASCIIToUTF16("httpsInvalid")) {
+    return NSImageFromImageSkiaWithColorSpace(
+        gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID,
+                              kHttpWarningIconWidth, gfx::kGoogleRed700),
+        base::mac::GetSRGBColorSpace());
+  }
+
   int iconId = delegate_->GetIconResourceID(icon);
   DCHECK_NE(-1, iconId);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(iconId).ToNSImage();
 }
 
 @end