Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/page_info_bubble_view.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/page_info_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
@@ skipping 37 matching lines @@
 // information is provided through the ModelChanged event.
 const int kPageInfoSlideDuration = 1450;
 
 // A section contains an image that shows a status (good or bad), a title, an
 // optional head-line (in bold) and a description.
 class Section : public views::View,
                 public views::LinkListener {
  public:
   Section(PageInfoBubbleView* owner,
           const PageInfoModel::SectionInfo& section_info,
-          const SkBitmap* status_icon,
+          const gfx::ImageSkia* status_icon,
           bool show_cert);
   virtual ~Section();
 
   // Notify the section how far along in the animation we are. This is used
   // to draw the section opaquely onto the canvas, to animate the section into
   // view.
   void SetAnimationStage(double animation_stage);
 
   // views::View methods:
   virtual int GetHeightForWidth(int w);
@@ skipping 115 matching lines @@
                      0,   // Ignored for USE_PREF.
                      0);  // Minimum size.
 
   int count = model_.GetSectionCount();
   bool only_internal_section = false;
   for (int i = 0; i < count; ++i) {
     PageInfoModel::SectionInfo info = model_.GetSectionInfo(i);
     if (count == 1 && info.type == PageInfoModel::SECTION_INFO_INTERNAL_PAGE)
       only_internal_section = true;
     layout->StartRow(0, 0);
-    const SkBitmap* icon = model_.GetIconImage(info.icon_id)->ToSkBitmap();
+    const gfx::ImageSkia* icon = model_.GetIconImage(
+        info.icon_id)->ToImageSkia();
     Section* section = new Section(this, info, icon, cert_id_ > 0);
     if (info.type == PageInfoModel::SECTION_INFO_FIRST_VISIT) {
       // This section is animated into view, so we need to set the height of it
       // according to the animation stage, and let it know how transparent it
       // should draw itself.
       section->SetAnimationStage(GetResizeAnimationCurrentValue());
       gfx::Size sz(views::Widget::GetLocalizedContentsSize(
           IDS_PAGEINFOBUBBLE_WIDTH_CHARS, IDS_PAGEINFOBUBBLE_HEIGHT_LINES));
       layout->AddView(section,
                       1, 1,  // Colspan & Rowspan.
@@ skipping 27 matching lines @@
 }
 
 gfx::Size PageInfoBubbleView::GetPreferredSize() {
   gfx::Size size(views::Widget::GetLocalizedContentsSize(
       IDS_PAGEINFOBUBBLE_WIDTH_CHARS, IDS_PAGEINFOBUBBLE_HEIGHT_LINES));
   size.set_height(0);
 
   int count = model_.GetSectionCount();
   for (int i = 0; i < count; ++i) {
     PageInfoModel::SectionInfo info = model_.GetSectionInfo(i);
-    const SkBitmap* icon = model_.GetIconImage(info.icon_id)->ToSkBitmap();
+    const gfx::ImageSkia* icon = model_.GetIconImage(
+        info.icon_id)->ToImageSkia();
     Section section(this, info, icon, cert_id_ > 0);
     size.Enlarge(0, section.GetHeightForWidth(size.width()));
   }
 
   static int separator_plus_padding = GetSeparatorSize().height();
 
   // Account for the separators and padding within sections.
   size.Enlarge(0, (count - 1) * separator_plus_padding);
 
   // Account for the Help Center link and the separator above it.
@@ skipping 53 matching lines @@
     SizeToContents();
   }
   BubbleDelegateView::AnimationProgressed(animation);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Section
 
 Section::Section(PageInfoBubbleView* owner,
                  const PageInfoModel::SectionInfo& section_info,
-                 const SkBitmap* state_icon,
+                 const gfx::ImageSkia* state_icon,
                  bool show_cert)
     : owner_(owner),
       info_(section_info),
       status_image_(NULL),
       link_(NULL) {
   if (state_icon) {
     status_image_ = new views::ImageView();
     status_image_->SetImage(*state_icon);
     AddChildView(status_image_);
   }
@@ skipping 134 matching lines @@
                              profile,
                              url,
                              ssl,
                              show_history,
                              navigator);
   views::BubbleDelegateView::CreateBubble(page_info_bubble);
   page_info_bubble->Show();
 }
 
 }