| Index: chrome/browser/extensions/extension_icon_manager.cc
|
| diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc
|
| index 292d00b587717f911d06e82dfdfb383d94037283..a557f428367471e501d9b4a2c20138c197d2c303 100644
|
| --- a/chrome/browser/extensions/extension_icon_manager.cc
|
| +++ b/chrome/browser/extensions/extension_icon_manager.cc
|
| @@ -12,7 +12,7 @@
|
| #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 "extensions/common/extension_resource.h"
|
| #include "grit/theme_resources.h"
|
| #include "skia/ext/image_operations.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| @@ -54,10 +54,11 @@ ExtensionIconManager::~ExtensionIconManager() {
|
|
|
| void ExtensionIconManager::LoadIcon(Profile* profile,
|
| const extensions::Extension* extension) {
|
| - ExtensionResource icon_resource = extensions::IconsInfo::GetIconResource(
|
| - extension,
|
| - extension_misc::EXTENSION_ICON_BITTY,
|
| - ExtensionIconSet::MATCH_BIGGER);
|
| + extensions::ExtensionResource icon_resource =
|
| + extensions::IconsInfo::GetIconResource(
|
| + extension,
|
| + 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.
|
|
|