Generalize ExtensionIconSet to store icon paths for custom size sets

chrome/browser/extensions/tab_helper.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/extensions/tab_helper.h"
 
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/app_notify_channel_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ skipping 354 matching lines @@
   return extension;
 }
 
 void TabHelper::UpdateExtensionAppIcon(const Extension* extension) {
   extension_app_icon_.reset();
 
   if (extension) {
     extension_app_image_loader_.reset(new ImageLoadingTracker(this));
     extension_app_image_loader_->LoadImage(
         extension,
-        extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_SMALLISH,
+        extension->GetIconResource(extension_misc::EXTENSION_ICON_SMALLISH,
                                    ExtensionIconSet::MATCH_EXACTLY),
-        gfx::Size(ExtensionIconSet::EXTENSION_ICON_SMALLISH,
-                  ExtensionIconSet::EXTENSION_ICON_SMALLISH),
+        gfx::Size(extension_misc::EXTENSION_ICON_SMALLISH,
+                  extension_misc::EXTENSION_ICON_SMALLISH),
         ImageLoadingTracker::CACHE);
   } else {
     extension_app_image_loader_.reset(NULL);
   }
 }
 
 void TabHelper::SetAppIcon(const SkBitmap& app_icon) {
   extension_app_icon_ = app_icon;
   web_contents()->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TITLE);
 }
@@ skipping 46 matching lines @@
     // malware site etc). When this happens, we abort the shortcut update.
     NavigationEntry* entry = controller.GetLastCommittedEntry();
     if (entry)
       GetApplicationInfo(entry->GetPageID());
     else
       pending_web_app_action_ = NONE;
   }
 }
 
 }  // namespace extensions