Integrate gfx::Image into the ResourceBundle.

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"
-#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/image.h"
 
 class PrefService;
 class Profile;
 
 // The model that provides the information that should be displayed in the page
 // info dialog/bubble.
 class PageInfoModel {
  public:
   class PageInfoModelObserver {
    public:
@@ skipping 48 matching lines @@
     // 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.
-  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,
                              bool found_visits,
                              int count,
                              base::Time first_visit);
 
  protected:
   // Testing constructor. DO NOT USE.
   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_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PageInfoModel);
 };
 
 #endif  // CHROME_BROWSER_PAGE_INFO_MODEL_H_