Move Icons out of Extension class

chrome/browser/ui/views/create_application_shortcut_view.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/ui/views/create_application_shortcut_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/history/select_favicon_frames.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
@@ skipping 454 matching lines @@
       app_(app),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
   web_app::UpdateShortcutInfoForApp(*app, profile, &shortcut_info_);
   // The icon will be resized to |max_size|.
   const gfx::Size max_size(kAppIconSize, kAppIconSize);
 
   // Look for an icon.  If there is no icon at the ideal size,
   // we will resize whatever we can get.  Making a large icon smaller
   // is prefered to making a small icon larger, so look for a larger
   // icon first:
-  ExtensionResource icon_resource = app_->GetIconResource(
+  ExtensionResource icon_resource = extensions::IconsInfo::GetIconResource(
+      app_,
       kAppIconSize,
       ExtensionIconSet::MATCH_BIGGER);
 
   // If no icon exists that is the desired size or larger, get the
   // largest icon available:
   if (icon_resource.empty()) {
-    icon_resource = app_->GetIconResource(
+    icon_resource = extensions::IconsInfo::GetIconResource(
+        app_,
         kAppIconSize,
         ExtensionIconSet::MATCH_SMALLER);
   }
 
   InitControls();
 
   // tracker_.LoadImage() can call OnImageLoaded() before it returns if the
   // image is cached.  This is very rare.  app_info_ must be initialized
   // when OnImageLoaded() is called, so we check it here.
   CHECK(app_info_);
@@ skipping 13 matching lines @@
   if (image.IsEmpty()) {
     shortcut_info_.favicon = ui::ResourceBundle::GetSharedInstance().
         GetImageNamed(IDR_APP_DEFAULT_ICON);
   } else {
     shortcut_info_.favicon = image;
   }
 
   CHECK(app_info_);
   static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
 }