Move Icons out of Extension class

chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.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/gtk/create_application_shortcuts_dialog_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/shell_integration_linux.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/browser/web_applications/web_app.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
@@ skipping 284 matching lines @@
       : CreateApplicationShortcutsDialogGtk(parent),
         app_(app),
         profile_path_(profile->GetPath()),
         ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this))  {
 
   // Get shortcut information now, it's needed for our UI.
   web_app::UpdateShortcutInfoForApp(*app, profile, &shortcut_info_);
 
   // Get the icon.
   const gfx::Size max_size(kIconPreviewSizePixels, kIconPreviewSizePixels);
-  ExtensionResource icon_resource = app_->GetIconResource(
-      kIconPreviewSizePixels, ExtensionIconSet::MATCH_BIGGER);
+  ExtensionResource icon_resource = extensions::IconsInfo::GetIconResource(
+      app_, kIconPreviewSizePixels, 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(
-        kIconPreviewSizePixels, ExtensionIconSet::MATCH_SMALLER);
+    icon_resource = extensions::IconsInfo::GetIconResource(
+        app_, kIconPreviewSizePixels, ExtensionIconSet::MATCH_SMALLER);
 
   // Note that tracker_.LoadImage() can call OnImageLoaded() before it returns,
   // if the image is cached.  This is very rare.  Do not do anything after
   // calling LoadImage() that OnImageLoaded() depends on.
   tracker_.LoadImage(app_,
                      icon_resource,
                      max_size,
                      ImageLoadingTracker::DONT_CACHE);
 }
 
@@ skipping 18 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (web_app::CreateShortcutsOnFileThread(shortcut_info)) {
     Release();
   } else {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&CreateChromeApplicationShortcutsDialogGtk::ShowErrorDialog,
                    this));
   }
 }