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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_icon_source.cc

Issue 9979001: Attempt to load component extension favicon from the resources first. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Merge Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 5 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/memory/ref_counted_memory.h" 9 #include "base/memory/ref_counted_memory.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 return; 119 return;
120 } 120 }
121 121
122 ExtensionIconRequest* request = GetData(request_id); 122 ExtensionIconRequest* request = GetData(request_id);
123 ExtensionResource icon = 123 ExtensionResource icon =
124 request->extension->GetIconResource(request->size, request->match); 124 request->extension->GetIconResource(request->size, request->match);
125 125
126 if (icon.relative_path().empty()) { 126 if (icon.relative_path().empty()) {
127 LoadIconFailed(request_id); 127 LoadIconFailed(request_id);
128 } else { 128 } else {
129 if (request->extension->location() == Extension::COMPONENT &&
130 TryLoadingComponentExtensionImage(icon, request_id)) {
131 return;
132 }
133 LoadExtensionImage(icon, request_id); 129 LoadExtensionImage(icon, request_id);
134 } 130 }
135 } 131 }
136 132
137 void ExtensionIconSource::LoadIconFailed(int request_id) { 133 void ExtensionIconSource::LoadIconFailed(int request_id) {
138 ExtensionIconRequest* request = GetData(request_id); 134 ExtensionIconRequest* request = GetData(request_id);
139 ExtensionResource icon = 135 ExtensionResource icon =
140 request->extension->GetIconResource(request->size, request->match); 136 request->extension->GetIconResource(request->size, request->match);
141 137
142 if (request->size == ExtensionIconSet::EXTENSION_ICON_BITTY) 138 if (request->size == ExtensionIconSet::EXTENSION_ICON_BITTY)
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 193
198 // There are cases where Resize returns an empty bitmap, for example if you 194 // There are cases where Resize returns an empty bitmap, for example if you
199 // ask for an image too large. In this case it is better to return the default 195 // ask for an image too large. In this case it is better to return the default
200 // image than returning nothing at all. 196 // image than returning nothing at all.
201 if (resized_image.empty()) 197 if (resized_image.empty())
202 resized_image = *default_image; 198 resized_image = *default_image;
203 199
204 FinalizeImage(&resized_image, request_id); 200 FinalizeImage(&resized_image, request_id);
205 } 201 }
206 202
207 bool ExtensionIconSource::TryLoadingComponentExtensionImage(
208 const ExtensionResource& icon, int request_id) {
209 ExtensionIconRequest* request = GetData(request_id);
210 FilePath directory_path = request->extension->path();
211 FilePath relative_path = directory_path.BaseName().Append(
212 icon.relative_path());
213 for (size_t i = 0; i < kComponentExtensionResourcesSize; ++i) {
214 FilePath bm_resource_path =
215 FilePath().AppendASCII(kComponentExtensionResources[i].name);
216 bm_resource_path = bm_resource_path.NormalizePathSeparators();
217 if (relative_path == bm_resource_path) {
218 scoped_ptr<SkBitmap> decoded(LoadImageByResourceId(
219 kComponentExtensionResources[i].value));
220 FinalizeImage(decoded.get(), request_id);
221 return true;
222 }
223 }
224 return false;
225 }
226
227 void ExtensionIconSource::LoadExtensionImage(const ExtensionResource& icon, 203 void ExtensionIconSource::LoadExtensionImage(const ExtensionResource& icon,
228 int request_id) { 204 int request_id) {
229 ExtensionIconRequest* request = GetData(request_id); 205 ExtensionIconRequest* request = GetData(request_id);
230 tracker_map_[next_tracker_id_++] = request_id; 206 tracker_map_[next_tracker_id_++] = request_id;
231 tracker_->LoadImage(request->extension, 207 tracker_->LoadImage(request->extension,
232 icon, 208 icon,
233 gfx::Size(request->size, request->size), 209 gfx::Size(request->size, request->size),
234 ImageLoadingTracker::DONT_CACHE); 210 ImageLoadingTracker::DONT_CACHE);
235 } 211 }
236 212
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 336
361 void ExtensionIconSource::ClearData(int request_id) { 337 void ExtensionIconSource::ClearData(int request_id) {
362 std::map<int, ExtensionIconRequest*>::iterator i = 338 std::map<int, ExtensionIconRequest*>::iterator i =
363 request_map_.find(request_id); 339 request_map_.find(request_id);
364 if (i == request_map_.end()) 340 if (i == request_map_.end())
365 return; 341 return;
366 342
367 delete i->second; 343 delete i->second;
368 request_map_.erase(i); 344 request_map_.erase(i);
369 } 345 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_icon_source.h ('k') | chrome/test/data/extensions/file_manager/app.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698