Generalize ExtensionIconSet to store icon paths for custom size sets

chrome/browser/background/background_application_list_model.cc

 // Copyright (c) 2012 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/background/background_application_list_model.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 using extensions::APIPermission;
@@ skipping 33 matching lines @@
 
   virtual ~Application();
 
   // Invoked when a request icon is available.
   virtual void OnImageLoaded(const gfx::Image& image,
                              const std::string& extension_id,
                              int index) OVERRIDE;
 
   // Uses the FILE thread to request this extension's icon, sized
   // appropriately.
-  void RequestIcon(ExtensionIconSet::Icons size);
+  void RequestIcon(extension_misc::ExtensionIcons size);
 
   const Extension* extension_;
   scoped_ptr<gfx::ImageSkia> icon_;
   BackgroundApplicationListModel* model_;
   ImageLoadingTracker tracker_;
 };
 
 namespace {
 void GetServiceApplications(ExtensionService* service,
                             ExtensionList* applications_result) {
@@ skipping 61 matching lines @@
     const gfx::Image& image,
     const std::string& extension_id,
     int index) {
   if (image.IsEmpty())
     return;
   icon_.reset(image.CopyImageSkia());
   model_->SendApplicationDataChangedNotifications(extension_);
 }
 
 void BackgroundApplicationListModel::Application::RequestIcon(
-    ExtensionIconSet::Icons size) {
+    extension_misc::ExtensionIcons size) {
   ExtensionResource resource = extension_->GetIconResource(
       size, ExtensionIconSet::MATCH_BIGGER);
   tracker_.LoadImage(extension_, resource, gfx::Size(size, size),
                      ImageLoadingTracker::CACHE);
 }
 
 BackgroundApplicationListModel::~BackgroundApplicationListModel() {
   STLDeleteContainerPairSecondPointers(applications_.begin(),
                                        applications_.end());
 }
@@ skipping 33 matching lines @@
     // App position is used as a dynamic command and so must be less than any
     // predefined command id.
     if (applications_.size() >= IDC_MinimumLabelValue) {
       LOG(ERROR) << "Background application limit of " << IDC_MinimumLabelValue
                  << " exceeded.  Ignoring.";
       return;
     }
     application = new Application(this, extension);
     applications_[extension->id()] = application;
     Update();
-    application->RequestIcon(ExtensionIconSet::EXTENSION_ICON_BITTY);
+    application->RequestIcon(extension_misc::EXTENSION_ICON_BITTY);
   }
 }
 
 void BackgroundApplicationListModel::DissociateApplicationData(
     const Extension* extension) {
   ApplicationMap::iterator found = applications_.find(extension->id());
   if (found != applications_.end()) {
     delete found->second;
     applications_.erase(found);
   }
@@ skipping 183 matching lines @@
          (*old_cursor)->name() == (*new_cursor)->name() &&
          (*old_cursor)->id() == (*new_cursor)->id()) {
     ++old_cursor;
     ++new_cursor;
   }
   if (old_cursor != extensions_.end() || new_cursor != extensions.end()) {
     extensions_ = extensions;
     FOR_EACH_OBSERVER(Observer, observers_, OnApplicationListChanged(profile_));
   }
 }