| Index: chrome/browser/media/media_stream_infobar_delegate.cc
|
| diff --git a/chrome/browser/media/media_stream_infobar_delegate.cc b/chrome/browser/media/media_stream_infobar_delegate.cc
|
| index 097dafdf5bc1e146f73986a54f525771c93521f2..754c25c2871ca2cc26154da33e2559dab177b0de 100644
|
| --- a/chrome/browser/media/media_stream_infobar_delegate.cc
|
| +++ b/chrome/browser/media/media_stream_infobar_delegate.cc
|
| @@ -14,7 +14,6 @@
|
| #include "grit/generated_resources.h"
|
| #include "grit/theme_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
|
|
| MediaStreamInfoBarDelegate::~MediaStreamInfoBarDelegate() {}
|
|
|
| @@ -62,10 +61,9 @@ void MediaStreamInfoBarDelegate::InfoBarDismissed() {
|
| controller_->Deny(false);
|
| }
|
|
|
| -gfx::Image* MediaStreamInfoBarDelegate::GetIcon() const {
|
| - return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
|
| - controller_->has_video() ?
|
| - IDR_INFOBAR_MEDIA_STREAM_CAMERA : IDR_INFOBAR_MEDIA_STREAM_MIC);
|
| +int MediaStreamInfoBarDelegate::GetIconID() const {
|
| + return controller_->has_video() ?
|
| + IDR_INFOBAR_MEDIA_STREAM_CAMERA : IDR_INFOBAR_MEDIA_STREAM_MIC;
|
| }
|
|
|
| InfoBarDelegate::Type MediaStreamInfoBarDelegate::GetInfoBarType() const {
|
|
|