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

Unified Diff: chrome/browser/ui/web_applications/web_app_ui.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/web_applications/web_app_ui.cc
diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc
index cfe3c0959f2b232bc5dfeeb0bab0d8d9f6a6b486..e505065ead097c93fe55756dea279661a9b07794 100644
--- a/chrome/browser/ui/web_applications/web_app_ui.cc
+++ b/chrome/browser/ui/web_applications/web_app_ui.cc
@@ -405,8 +405,9 @@ void UpdateShortcutInfoAndIconForApp(
std::vector<extensions::ImageLoader::ImageRepresentation> info_list;
for (size_t i = 0; i < arraysize(kDesiredSizes); ++i) {
int size = kDesiredSizes[i];
- ExtensionResource resource = extensions::IconsInfo::GetIconResource(
- &extension, size, ExtensionIconSet::MATCH_EXACTLY);
+ extensions::ExtensionResource resource =
+ extensions::IconsInfo::GetIconResource(
+ &extension, size, ExtensionIconSet::MATCH_EXACTLY);
if (!resource.empty()) {
info_list.push_back(extensions::ImageLoader::ImageRepresentation(
resource,
@@ -423,8 +424,9 @@ void UpdateShortcutInfoAndIconForApp(
// If there is no icon at the desired sizes, we will resize what we can get.
// Making a large icon smaller is preferred to making a small icon larger,
// so look for a larger icon first:
- ExtensionResource resource = extensions::IconsInfo::GetIconResource(
- &extension, size, ExtensionIconSet::MATCH_BIGGER);
+ extensions::ExtensionResource resource =
+ extensions::IconsInfo::GetIconResource(
+ &extension, size, ExtensionIconSet::MATCH_BIGGER);
if (resource.empty()) {
resource = extensions::IconsInfo::GetIconResource(
&extension, size, ExtensionIconSet::MATCH_SMALLER);
« no previous file with comments | « chrome/browser/ui/views/script_bubble_view.cc ('k') | chrome/browser/ui/webui/extensions/extension_icon_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698