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

Unified Diff: chrome/browser/ui/webui/extensions/extension_icon_source.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/ui/webui/extensions/extension_icon_source.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
index 4e5c1466d3866dcdc901e02b38abf0e836751563..62ccf1ac097bc951f226573d6694cb10fa288a21 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -22,8 +22,8 @@
#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/extensions/extension_resource.h"
#include "chrome/common/url_constants.h"
+#include "extensions/common/extension_resource.h"
#include "googleurl/src/gurl.h"
#include "grit/component_extension_resources_map.h"
#include "grit/theme_resources.h"
@@ -132,7 +132,7 @@ void ExtensionIconSource::StartDataRequest(
}
ExtensionIconRequest* request = GetData(next_id);
- ExtensionResource icon = extensions::IconsInfo::GetIconResource(
+ extensions::ExtensionResource icon = extensions::IconsInfo::GetIconResource(
request->extension, request->size, request->match);
if (icon.relative_path().empty()) {
@@ -198,8 +198,9 @@ void ExtensionIconSource::LoadDefaultImage(int request_id) {
FinalizeImage(&resized_image, request_id);
}
-void ExtensionIconSource::LoadExtensionImage(const ExtensionResource& icon,
- int request_id) {
+void ExtensionIconSource::LoadExtensionImage(
+ const extensions::ExtensionResource& icon,
+ int request_id) {
ExtensionIconRequest* request = GetData(request_id);
extensions::ImageLoader::Get(profile_)->LoadImageAsync(
request->extension, icon,
@@ -258,7 +259,7 @@ void ExtensionIconSource::OnImageLoaded(int request_id,
void ExtensionIconSource::LoadIconFailed(int request_id) {
ExtensionIconRequest* request = GetData(request_id);
- ExtensionResource icon = extensions::IconsInfo::GetIconResource(
+ extensions::ExtensionResource icon = extensions::IconsInfo::GetIconResource(
request->extension, request->size, request->match);
if (request->size == extension_misc::EXTENSION_ICON_BITTY)

Powered by Google App Engine
This is Rietveld 408576698