Refactor the code for loading icons into the PageInfoModel.

chrome/browser/views/page_info_bubble_view.cc

 // Copyright (c) 2010 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/views/page_info_bubble_view.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/separator.h"
 #include "views/grid_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 namespace {
 
 // Layout constants.
 const int kHGapToBorder = 11;
 const int kVGapToImage = 10;
 const int kVGapToHeadline = 7;
 const int kHGapImageToDescription = 6;
 const int kTextPaddingRight = 10;
 const int kPaddingBelowSeparator = 4;
 const int kPaddingAboveSeparator = 13;
 const int kIconOffset = 28;
 
 // 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::LinkController {
  public:
   Section(PageInfoBubbleView* owner,
           const PageInfoModel::SectionInfo& section_info,
+          const SkBitmap* status_icon,
           bool show_cert);
   virtual ~Section();
 
   // views::View methods:
   virtual int GetHeightForWidth(int w);
   virtual void Layout();
 
   // views::LinkController methods:
   virtual void LinkActivated(views::Link* source, int event_flags);
 
@@ skipping 54 matching lines @@
                      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);
     // TODO(finnur): Remove title from the info struct, since it is
     //               not used anymore.
-    layout->AddView(new Section(this, info, cert_id_ > 0));
+    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, 0);
   help_center_link_ =
       new views::Link(l10n_util::GetString(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);
-    Section section(this, info, cert_id_ > 0);
+    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 17 matching lines @@
   GURL url = GURL(l10n_util::GetStringUTF16(IDS_PAGE_INFO_HELP_CENTER));
   Browser* browser = BrowserList::GetLastActive();
   browser->OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Section
 
 Section::Section(PageInfoBubbleView* owner,
                  const PageInfoModel::SectionInfo& section_info,
+                 const SkBitmap* state_icon,
                  bool show_cert)
     : owner_(owner),
       info_(section_info),
       status_image_(NULL),
       link_(NULL) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-
-  if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY ||
-      info_.type == PageInfoModel::SECTION_INFO_CONNECTION) {
+  if (state_icon) {
     status_image_ = new views::ImageView();
-    switch (info_.state) {
-      case PageInfoModel::SECTION_STATE_OK:
-        status_image_->SetImage(rb.GetBitmapNamed(IDR_PAGEINFO_GOOD));
-        break;
-      case PageInfoModel::SECTION_STATE_WARNING_MAJOR:
-        status_image_->SetImage(rb.GetBitmapNamed(IDR_PAGEINFO_WARNING_MAJOR));
-        break;
-      case PageInfoModel::SECTION_STATE_WARNING_MINOR:
-        status_image_->SetImage(rb.GetBitmapNamed(IDR_PAGEINFO_WARNING_MINOR));
-        break;
-      case PageInfoModel::SECTION_STATE_ERROR:
-        status_image_->SetImage(rb.GetBitmapNamed(IDR_PAGEINFO_BAD));
-        break;
-      default:
-        NOTREACHED();  // Do you need to add a case here?
-    }
-    AddChildView(status_image_);
-  } else if (info_.type == PageInfoModel::SECTION_INFO_FIRST_VISIT) {
-    status_image_ = new views::ImageView();
-    status_image_->SetImage(info_.state == PageInfoModel::SECTION_STATE_OK ?
-        rb.GetBitmapNamed(IDR_PAGEINFO_INFO) :
-        rb.GetBitmapNamed(IDR_PAGEINFO_WARNING_MAJOR));
+    status_image_->SetImage(*state_icon);
     AddChildView(status_image_);
   }
 
   headline_label_ = new views::Label(UTF16ToWideHack(info_.headline));
   headline_label_->SetFont(
       headline_label_->font().DeriveFont(0, gfx::Font::BOLD));
   headline_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(headline_label_);
 
   description_label_ = new views::Label(UTF16ToWideHack(info_.description));
@@ skipping 97 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);
 }
 
 }