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

Unified Diff: chrome/browser/media/media_stream_capture_indicator.cc

Issue 11786003: Move Icons out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action
Patch Set: Created 7 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/browser/media/media_stream_capture_indicator.cc
diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc
index a8ad06ef5a37a298bcb878b5c31950efc9d4a8d4..ac7a5ff7a821a8a05553171f4926bacf01135f45 100644
--- a/chrome/browser/media/media_stream_capture_indicator.cc
+++ b/chrome/browser/media/media_stream_capture_indicator.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/status_icons/status_icon.h"
#include "chrome/browser/status_icons/status_tray.h"
#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/invalidate_type.h"
@@ -330,7 +331,8 @@ void MediaStreamCaptureIndicator::ShowBalloon(
should_show_balloon_ = true;
extensions::ImageLoader::Get(profile)->LoadImageAsync(
extension,
- extension->GetIconResource(32, ExtensionIconSet::MATCH_BIGGER),
+ extensions::IconsInfo::GetIconResource(
+ extension, 32, ExtensionIconSet::MATCH_BIGGER),
gfx::Size(32, 32),
base::Bind(&MediaStreamCaptureIndicator::OnImageLoaded,
this, message));

Powered by Google App Engine
This is Rietveld 408576698