Move Icons out of Extension class

chrome/browser/extensions/crx_installer.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/extensions/crx_installer.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/extensions/requirements_checker.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 48 matching lines @@
       profile_(frontend_weak->profile()),
       client_(client),
       apps_require_extension_mime_type_(false),
       allow_silent_install_(false),
       install_cause_(extension_misc::INSTALL_CAUSE_UNSET),
       creation_flags_(Extension::NO_FLAGS),
       off_store_install_allow_reason_(OffStoreInstallDisallowed),
       did_handle_successfully_(true),
       record_oauth2_grant_(false),
       error_on_unsupported_requirements_(false),
-      requirements_checker_(new extensions::RequirementsChecker()),
+      requirements_checker_(new RequirementsChecker()),
       has_requirement_errors_(false),
       install_wait_for_idle_(true) {
   installer_task_runner_ = frontend_weak->GetFileTaskRunner();
   if (!approval)
     return;
 
   CHECK(profile_->IsSameProfile(approval->profile));
   if (client_) {
     client_->install_ui()->SetUseAppInstalledBubble(
         approval->use_app_installed_bubble);
@@ skipping 257 matching lines @@
   // the temp dir.
   unpacked_extension_root_ = extension_dir;
 
   CrxInstallerError error = AllowInstall(extension);
   if (error.type() != CrxInstallerError::ERROR_NONE) {
     ReportFailureFromFileThread(error);
     return;
   }
 
   if (client_) {
-    Extension::DecodeIcon(extension_.get(),
+    IconsInfo::DecodeIcon(extension_.get(),
                           extension_misc::EXTENSION_ICON_LARGE,
                           ExtensionIconSet::MATCH_BIGGER,
                           &install_icon_);
   }
 
   if (!BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&CrxInstaller::CheckRequirements, this)))
     NOTREACHED();
 }
@@ skipping 271 matching lines @@
     temp_dir_ = FilePath();
   }
 
   if (delete_source_ && !source_file_.value().empty()) {
     extension_file_util::DeleteFile(source_file_, false);
     source_file_ = FilePath();
   }
 }
 
 }  // namespace extensions