Refactor the code for loading icons into the PageInfoModel.

chrome/browser/page_info_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_PAGE_INFO_MODEL_H_
 #define CHROME_BROWSER_PAGE_INFO_MODEL_H_
 #pragma once
 
 #include <vector>
 
 #include "base/string16.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "googleurl/src/gurl.h"
 
+#ifdef __OBJC__
+@class NSImage;
+#else
+class NSImage;
+#endif  // __OBJC__
 class PrefService;
 class Profile;
+class SkBitmap;
+
+#if defined(USE_X11) && !defined(TOOLKIT_VIEWS)
+typedef struct _GdkPixbuf GdkPixbuf;
+#endif
 
 // The model that provides the information that should be displayed in the page
 // info dialog/bubble.
 class PageInfoModel {
  public:
   class PageInfoModelObserver {
    public:
     virtual ~PageInfoModelObserver() {}
 
     virtual void ModelChanged() = 0;
   };
 
   enum SectionInfoType {
     SECTION_INFO_IDENTITY = 0,
     SECTION_INFO_CONNECTION,
     SECTION_INFO_FIRST_VISIT,
   };
 
-  enum SectionInfoState {
-    SECTION_STATE_OK = 0,
+  // TODO(rsesek): Extract this information out to gfx::NativeImage.
+#if defined(OS_MACOSX)
+  typedef NSImage* ImageType;
+#elif defined(USE_X11) && !defined(TOOLKIT_VIEWS)
+  typedef GdkPixbuf* ImageType;
+#else
+  typedef const SkBitmap* ImageType;
+#endif
+
+  enum SectionStateIcon {
+    // No icon.
+    ICON_NONE = -1,
+    // State is OK.
+    ICON_STATE_OK,
     // For example, if state is OK but contains mixed content.
-    SECTION_STATE_WARNING_MINOR,
+    ICON_STATE_WARNING_MINOR,
     // For example, if content was served over HTTP.
-    SECTION_STATE_WARNING_MAJOR,
+    ICON_STATE_WARNING_MAJOR,
     // For example, unverified identity over HTTPS.
-    SECTION_STATE_ERROR,
+    ICON_STATE_ERROR,
+    // An information icon.
+    ICON_STATE_INFO
   };
 
   struct SectionInfo {
-    SectionInfo(SectionInfoState state,
+    SectionInfo(SectionStateIcon icon_id,
                 const string16& title,
                 const string16& headline,
                 const string16& description,
                 SectionInfoType type)
-        : state(state),
+        : icon_id(icon_id),
           title(title),
           headline(headline),
           description(description),
           type(type) {
     }
 
     // The overall state of the connection (error, warning, ok).
-    SectionInfoState state;
+    SectionStateIcon icon_id;
 
     // The title of the section.
     string16 title;
 
     // A single line describing the section, optional.
     string16 headline;
 
     // The full description of what this section is.
     string16 description;
 
     // The type of SectionInfo we are dealing with, for example: Identity,
     // Connection, First Visit.
     SectionInfoType type;
   };
 
   PageInfoModel(Profile* profile,
                 const GURL& url,
                 const NavigationEntry::SSLStatus& ssl,
                 bool show_history,
                 PageInfoModelObserver* observer);
   ~PageInfoModel();
 
   int GetSectionCount();
   SectionInfo GetSectionInfo(int index);
 
+  // Returns the native image type for an icon with the given id.
+  ImageType GetIconImage(SectionStateIcon icon_id);
+
   // Callback from history service with number of visits to url.
   void OnGotVisitCountToHost(HistoryService::Handle handle,
                              bool found_visits,
                              int count,
                              base::Time first_visit);
 
   static void RegisterPrefs(PrefService* prefs);
 
  protected:
   // Testing constructor. DO NOT USE.
   PageInfoModel();
 
+  // Shared initialization for default and testing constructor.
+  void Init();
+
+  // Gets the native image resource of the given id from the ResourceBundle.
+  // Mac only: image is owned by caller. On other platforms, the image is owned
+  // by the shared ResourceBundle.
+  ImageType GetBitmapNamed(int resource_id);
+
   PageInfoModelObserver* observer_;
 
   std::vector<SectionInfo> sections_;
 
+  // All possible icons that go next to the text descriptions to indicate state.
+  std::vector<ImageType> icons_;
+
   // Used to request number of visits.
   CancelableRequestConsumer request_consumer_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PageInfoModel);
 };
 
 #endif  // CHROME_BROWSER_PAGE_INFO_MODEL_H_