Move Icons out of Extension class

chrome/browser/ui/views/create_application_shortcut_view.cc

Index: chrome/browser/ui/views/create_application_shortcut_view.cc
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index f5e3b08b0b1ff948dcb56086145173467be06261..43108a1c35d93edf66028fd5a697ed30664c3efa 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.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.
 
@@ -21,6 +21,7 @@
 #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"
@@ -494,14 +495,16 @@ CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
   // 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);
   }