Integrate gfx::Image into the ResourceBundle.

chrome/browser/ui/views/page_info_bubble_view.cc

 // Copyright (c) 2011 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 "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/info_bubble.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/image.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/separator.h"
 #include "views/layout/grid_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 namespace {
 
 // Layout constants.
@@ skipping 106 matching lines @@
                      views::GridLayout::FILL,     // Vertical resize.
                      1,   // Resize weight.
                      views::GridLayout::USE_PREF,  // Size type.
                      0,   // Ignored for USE_PREF.
                      0);  // Minimum size.
 
   int count = model_.GetSectionCount();
   for (int i = 0; i < count; ++i) {
     PageInfoModel::SectionInfo info = model_.GetSectionInfo(i);
     layout->StartRow(0, 0);
-    const SkBitmap* icon = model_.GetIconImage(info.icon_id);
+    const SkBitmap* icon = *model_.GetIconImage(info.icon_id);
     layout->AddView(new Section(this, info, icon, cert_id_ > 0));
 
     // Add separator after all sections.
     layout->AddPaddingRow(0, kPaddingAboveSeparator);
     layout->StartRow(0, 0);
     layout->AddView(new views::Separator());
     layout->AddPaddingRow(0, kPaddingBelowSeparator);
   }
 
   // Then add the help center link at the bottom.
   layout->StartRow(0, 1);
   help_center_link_ = new views::Link(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_PAGE_INFO_HELP_CENTER_LINK)));
   help_center_link_->SetController(this);
   layout->AddView(help_center_link_);
 }
 
 gfx::Size PageInfoBubbleView::GetPreferredSize() {
   gfx::Size size(views::Window::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);
+    const SkBitmap* icon = *model_.GetIconImage(info.icon_id);
     Section section(this, info, icon, cert_id_ > 0);
     size.Enlarge(0, section.GetHeightForWidth(size.width()));
   }
 
   // Calculate how much space the separators take up (with padding).
   views::Separator separator;
   gfx::Size separator_size = separator.GetPreferredSize();
   gfx::Size separator_plus_padding(0, separator_size.height() +
                                       kPaddingAboveSeparator +
                                       kPaddingBelowSeparator);
@@ skipping 169 matching lines @@
   PageInfoBubbleView* page_info_bubble =
       new PageInfoBubbleView(parent, profile, url, ssl, show_history);
   InfoBubble* info_bubble =
       InfoBubble::Show(browser_view->GetWidget(), bounds,
                        BubbleBorder::TOP_LEFT,
                        page_info_bubble, page_info_bubble);
   page_info_bubble->set_info_bubble(info_bubble);
 }
 
 }