diff options
| author | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 00:07:59 +0000 |
|---|---|---|
| committer | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 00:07:59 +0000 |
| commit | faf87191b35fb6770637be7706cf0c177f541ec6 (patch) | |
| tree | 5eb1ab5ece8cd997364f832b18b8c65ee33d4fee /chrome/browser/extensions/extension_icon_manager.cc | |
| parent | e45c90cb1ecb6e21516abfbcb8b27d749dbd6352 (diff) | |
| download | chromium_src-faf87191b35fb6770637be7706cf0c177f541ec6.zip chromium_src-faf87191b35fb6770637be7706cf0c177f541ec6.tar.gz chromium_src-faf87191b35fb6770637be7706cf0c177f541ec6.tar.bz2 | |
Generalize ExtensionIconSet to store icon paths for custom size sets.
This is needed to make it easier to handle sets of extension icons that are not
defined in extension manifest (e.g. default icons for browser_actions)
BUG=138025, 135271
TEST=existing tests
For mechanical changes caused by moving ExtensionIcons from ExtensionIconSet to extension_misc namespace (patchset 14):
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10843014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_icon_manager.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_icon_manager.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index ac47e2f..fea156f 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/chrome/browser/extensions/extension_icon_manager.cc @@ -7,6 +7,7 @@ #include "base/logging.h" #include "base/stl_util.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 "grit/theme_resources.h" @@ -50,7 +51,7 @@ ExtensionIconManager::~ExtensionIconManager() { void ExtensionIconManager::LoadIcon(const extensions::Extension* extension) { ExtensionResource icon_resource = extension->GetIconResource( - ExtensionIconSet::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_BIGGER); + extension_misc::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_BIGGER); if (!icon_resource.extension_root().empty()) { // Insert into pending_icons_ first because LoadImage can call us back // synchronously if the image is already cached. |