Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3248)

Unified Diff: chrome/browser/extensions/extension_icon_image.cc

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.
« no previous file with comments | « chrome/browser/extensions/extension_function_test_utils.cc ('k') | chrome/browser/extensions/extension_icon_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698