Integrate gfx::Image into the ResourceBundle.

chrome/browser/page_info_model.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/page_info_model.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#if defined(OS_MACOSX)
-#include "base/mac/mac_util.h"
-#endif
-
 PageInfoModel::PageInfoModel(Profile* profile,
                              const GURL& url,
                              const NavigationEntry::SSLStatus& ssl,
                              bool show_history,
                              PageInfoModelObserver* observer)
     : observer_(observer) {
   Init();
 
   SectionStateIcon icon_id = ICON_STATE_OK;
   string16 headline;
@@ skipping 233 matching lines @@
   HistoryService* history = profile->GetHistoryService(
       Profile::EXPLICIT_ACCESS);
   if (show_history && history) {
     history->GetVisitCountToHost(
         url,
         &request_consumer_,
         NewCallback(this, &PageInfoModel::OnGotVisitCountToHost));
   }
 }
 
-PageInfoModel::~PageInfoModel() {
-#if defined(OS_MACOSX)
-  // Release the NSImages.
-  for (std::vector<gfx::NativeImage>::iterator it = icons_.begin();
-       it != icons_.end(); ++it) {
-    base::mac::NSObjectRelease(*it);
-  }
-#endif
-}
-
 int PageInfoModel::GetSectionCount() {
   return sections_.size();
 }
 
 PageInfoModel::SectionInfo PageInfoModel::GetSectionInfo(int index) {
   DCHECK(index < static_cast<int>(sections_.size()));
   return sections_[index];
 }
 
-gfx::NativeImage PageInfoModel::GetIconImage(SectionStateIcon icon_id) {
+gfx::Image* PageInfoModel::GetIconImage(SectionStateIcon icon_id) {
   if (icon_id == ICON_NONE)
     return NULL;
   // The bubble uses new, various icons.
   return icons_[icon_id];
 }
 
 void PageInfoModel::OnGotVisitCountToHost(HistoryService::Handle handle,
                                           bool found_visits,
                                           int count,
                                           base::Time first_visit) {
@@ skipping 30 matching lines @@
   observer_->ModelChanged();
 }
 
 PageInfoModel::PageInfoModel() : observer_(NULL) {
   Init();
 }
 
 void PageInfoModel::Init() {
   // Loads the icons into the vector. The order must match the SectionStateIcon
   // enum.
-  icons_.push_back(GetBitmapNamed(IDR_PAGEINFO_GOOD));
-  icons_.push_back(GetBitmapNamed(IDR_PAGEINFO_WARNING_MINOR));
-  icons_.push_back(GetBitmapNamed(IDR_PAGEINFO_WARNING_MAJOR));
-  icons_.push_back(GetBitmapNamed(IDR_PAGEINFO_BAD));
-  icons_.push_back(GetBitmapNamed(IDR_PAGEINFO_INFO));
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_GOOD));
+  icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_WARNING_MINOR));
+  icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_WARNING_MAJOR));
+  icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_BAD));
+  icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_INFO));
 }
-
-gfx::NativeImage PageInfoModel::GetBitmapNamed(int resource_id) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  gfx::NativeImage image = rb.GetNativeImageNamed(resource_id);
-#if defined(OS_MACOSX)
-  // Unlike other platforms, the Mac ResourceBundle does not keep a shared image
-  // cache. These are released in the dtor.
-  base::mac::NSObjectRetain(image);
-#endif
-  return image;
-}