| Index: chrome/browser/extensions/extension_icon_image.cc
|
| diff --git a/chrome/browser/extensions/extension_icon_image.cc b/chrome/browser/extensions/extension_icon_image.cc
|
| index c2fd3cd6cd42ee993cc1fbd5207a13463e5ffe0e..d051ee7ec1d1d89bfe4056c30b553624bf46b404 100644
|
| --- a/chrome/browser/extensions/extension_icon_image.cc
|
| +++ b/chrome/browser/extensions/extension_icon_image.cc
|
| @@ -42,14 +42,14 @@ namespace {
|
|
|
| const int kMatchBiggerTreshold = 32;
|
|
|
| -ExtensionResource GetExtensionIconResource(
|
| +extensions::ExtensionResource GetExtensionIconResource(
|
| const extensions::Extension* extension,
|
| const ExtensionIconSet& icons,
|
| int size,
|
| ExtensionIconSet::MatchType match_type) {
|
| std::string path = icons.Get(size, match_type);
|
| if (path.empty())
|
| - return ExtensionResource();
|
| + return extensions::ExtensionResource();
|
|
|
| return extension->GetResource(path);
|
| }
|
| @@ -167,7 +167,7 @@ gfx::ImageSkiaRep IconImage::LoadImageForScaleFactor(
|
| const int resource_size_in_pixel =
|
| static_cast<int>(resource_size_in_dip_ * scale);
|
|
|
| - ExtensionResource resource;
|
| + extensions::ExtensionResource resource;
|
|
|
| // Find extension resource for non bundled component extensions.
|
| // We try loading bigger image only if resource size is >= 32.
|
|
|