Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9098)

Unified Diff: chrome/default_plugin/plugin_impl_mac.mm

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/default_plugin/plugin_impl_mac.mm
diff --git a/chrome/default_plugin/plugin_impl_mac.mm b/chrome/default_plugin/plugin_impl_mac.mm
index 77fb9e32d344aa5ad9fd448e84f0b0ffa922e5af..6ab353937f1db7c2542a0ced51ea0a1d36cfe072 100644
--- a/chrome/default_plugin/plugin_impl_mac.mm
+++ b/chrome/default_plugin/plugin_impl_mac.mm
@@ -15,6 +15,7 @@
#include "grit/webkit_strings.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image.h"
#include "unicode/locid.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/plugins/npapi/default_plugin_shared.h"
@@ -28,7 +29,6 @@ PluginInstallerImpl::PluginInstallerImpl(int16 mode)
}
PluginInstallerImpl::~PluginInstallerImpl() {
- [image_ release];
[command_ release];
}
@@ -51,7 +51,7 @@ bool PluginInstallerImpl::Initialize(void* module_handle, NPP instance,
IDS_DEFAULT_PLUGIN_NO_PLUGIN_AVAILABLE_MSG)) retain];
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- image_ = [rb.GetNativeImageNamed(IDR_PLUGIN_ICON) retain];
+ image_ = rb.GetNativeImageNamed(IDR_PLUGIN_ICON);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698