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

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: Latest master + Yoyo's requests Created 7 years, 11 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 0265e061760cc910ded60f8a38979baba307fb4e..db4f862fdd49a3040b0b8813b71b2d4b3dfa2553 100644
--- a/chrome/browser/media/media_stream_capture_indicator.cc
+++ b/chrome/browser/media/media_stream_capture_indicator.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -16,6 +16,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"
@@ -283,7 +284,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