Integrate gfx::Image into the ResourceBundle.

chrome/browser/page_info_model.h

Index: chrome/browser/page_info_model.h
diff --git a/chrome/browser/page_info_model.h b/chrome/browser/page_info_model.h
index df7d986e642f8f00d808d96f5b7fba8ea0b5487d..94903854d92fef682d26be9ec3e809446d1a28c3 100644
--- a/chrome/browser/page_info_model.h
+++ b/chrome/browser/page_info_model.h
@@ -13,7 +13,7 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "googleurl/src/gurl.h"
-#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/image.h"
 
 class PrefService;
 class Profile;
@@ -82,13 +82,12 @@ class PageInfoModel {
                 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.
-  gfx::NativeImage GetIconImage(SectionStateIcon icon_id);
+  gfx::Image* GetIconImage(SectionStateIcon icon_id);
 
   // Callback from history service with number of visits to url.
   void OnGotVisitCountToHost(HistoryService::Handle handle,
@@ -103,16 +102,12 @@ class PageInfoModel {
   // Shared initialization for default and testing constructor.
   void Init();
 
-  // Wrapper for ResourceBundle::GetNativeImage() so that Mac can retain its
-  // icons.
-  gfx::NativeImage 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<gfx::NativeImage> icons_;
+  std::vector<gfx::Image*> icons_;
 
   // Used to request number of visits.
   CancelableRequestConsumer request_consumer_;