| Index: chrome/browser/plugins/plugin_infobar_delegates.cc
|
| diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc
|
| index 3d9541f9851876677fa9ba59373d4da99706e401..b19157ae8d2f0a085a882dbf63661ca08e0f9bd2 100644
|
| --- a/chrome/browser/plugins/plugin_infobar_delegates.cc
|
| +++ b/chrome/browser/plugins/plugin_infobar_delegates.cc
|
| @@ -74,9 +74,8 @@ void PluginInfoBarDelegate::LoadBlockedPlugins() {
|
| }
|
| }
|
|
|
| -gfx::Image* PluginInfoBarDelegate::GetIcon() const {
|
| - return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
|
| - IDR_INFOBAR_PLUGIN_INSTALL);
|
| +int PluginInfoBarDelegate::GetIconID() const {
|
| + return IDR_INFOBAR_PLUGIN_INSTALL;
|
| }
|
|
|
| string16 PluginInfoBarDelegate::GetLinkText() const {
|
| @@ -391,9 +390,8 @@ PluginInstallerInfoBarDelegate::PluginInstallerInfoBarDelegate(
|
| PluginInstallerInfoBarDelegate::~PluginInstallerInfoBarDelegate() {
|
| }
|
|
|
| -gfx::Image* PluginInstallerInfoBarDelegate::GetIcon() const {
|
| - return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
|
| - IDR_INFOBAR_PLUGIN_INSTALL);
|
| +int PluginInstallerInfoBarDelegate::GetIconID() const {
|
| + return IDR_INFOBAR_PLUGIN_INSTALL;
|
| }
|
|
|
| string16 PluginInstallerInfoBarDelegate::GetMessageText() const {
|
| @@ -502,9 +500,8 @@ PluginMetroModeInfoBarDelegate::PluginMetroModeInfoBarDelegate(
|
| PluginMetroModeInfoBarDelegate::~PluginMetroModeInfoBarDelegate() {
|
| }
|
|
|
| -gfx::Image* PluginMetroModeInfoBarDelegate::GetIcon() const {
|
| - return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
|
| - IDR_INFOBAR_PLUGIN_INSTALL);
|
| +int PluginMetroModeInfoBarDelegate::GetIconID() const {
|
| + return IDR_INFOBAR_PLUGIN_INSTALL;
|
| }
|
|
|
| string16 PluginMetroModeInfoBarDelegate::GetMessageText() const {
|
|
|