Move Icons out of Extension class

chrome/browser/media/media_stream_capture_indicator.cc

-// 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.
 
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #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"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/media_stream_request.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 247 matching lines @@
 
     WebContents* web_contents = tab_util::GetWebContentsByID(
         render_process_id, render_view_id);
 
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
 
     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));
     return;
   }
 
   string16 title = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
   string16 body = l10n_util::GetStringFUTF16(message_id,
       GetSecurityOrigin(render_process_id, render_view_id));
   status_icon_->DisplayBalloon(*balloon_image_, title, body);
@@ skipping 217 matching lines @@
     return false;
 
   CaptureDeviceTabs::const_iterator iter = std::find_if(
       tabs_.begin(), tabs_.end(), TabEquals(web_contents,
                                             render_process_id,
                                             render_view_id));
   if (iter == tabs_.end())
     return false;
   return (iter->tab_capture_ref_count > 0);
 }