diff options
Diffstat (limited to 'chrome/default_plugin')
| -rw-r--r-- | chrome/default_plugin/plugin_impl_mac.h | 2 | ||||
| -rw-r--r-- | chrome/default_plugin/plugin_impl_mac.mm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/default_plugin/plugin_impl_mac.h b/chrome/default_plugin/plugin_impl_mac.h index 856f749..fdd6fda 100644 --- a/chrome/default_plugin/plugin_impl_mac.h +++ b/chrome/default_plugin/plugin_impl_mac.h @@ -285,7 +285,7 @@ class PluginInstallerImpl { // Dimensions of the plugin uint32_t width_; uint32_t height_; - // Plugin icon + // Plugin icon, weak (owned by ResourceBundle). NSImage* image_; // Displayed text NSString* command_; diff --git a/chrome/default_plugin/plugin_impl_mac.mm b/chrome/default_plugin/plugin_impl_mac.mm index 77fb9e3..6ab3539 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; } |