Http Bad: Add icons to the http warning message

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 "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 "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/views/border.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 60 matching lines @@
       controller_->layout_model().GetValueFontListForRow(index),
       controller_->layout_model().GetValueFontColorForRow(index), value_rect,
       text_align);
 
   // Use this to figure out where all the other Autofill items should be placed.
   int x_align_left =
       is_rtl ? AutofillPopupLayoutModel::kEndPadding
              : entry_rect.right() - AutofillPopupLayoutModel::kEndPadding;
 
   // Draw the Autofill icon, if one exists
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   int row_height = controller_->layout_model().GetRowBounds(index).height();
   if (!controller_->GetSuggestionAt(index).icon.empty()) {
-    int icon = controller_->layout_model().GetIconResourceID(
-        controller_->GetSuggestionAt(index).icon);
-    DCHECK_NE(-1, icon);
-    const gfx::ImageSkia* image = rb.GetImageSkiaNamed(icon);
-    int icon_y = entry_rect.y() + (row_height - image->height()) / 2;
+    const gfx::ImageSkia image =
+        controller_->layout_model().GetIconImage(index);
+    int icon_y = entry_rect.y() + (row_height - image.height()) / 2;
 
-    x_align_left += is_rtl ? 0 : -image->width();
+    x_align_left += is_rtl ? 0 : -image.width();
 
-    canvas->DrawImageInt(*image, x_align_left, icon_y);
+    canvas->DrawImageInt(image, x_align_left, icon_y);
 
-    x_align_left +=
-        is_rtl ? image->width() + AutofillPopupLayoutModel::kIconPadding
-               : -AutofillPopupLayoutModel::kIconPadding;
+    x_align_left += is_rtl
+                        ? image.width() + AutofillPopupLayoutModel::kIconPadding
+                        : -AutofillPopupLayoutModel::kIconPadding;
   }
 
   // Draw the label text.
   const int label_width =
       gfx::GetStringWidth(controller_->GetElidedLabelAt(index),
                           controller_->layout_model().GetLabelFontList());
   if (!is_rtl)
     x_align_left -= label_width;
 
   canvas->DrawStringRectWithFlags(
@@ skipping 11 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