projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
extensions
/
extension_icon_image.cc
diff --git
a/src/chrome/browser/extensions/extension_icon_image.cc
b/src/chrome/browser/extensions/extension_icon_image.cc
index
3aa36c6
..
625bb01
100644
(file)
--- a/
src/chrome/browser/extensions/extension_icon_image.cc
+++ b/
src/chrome/browser/extensions/extension_icon_image.cc
@@
-196,12
+196,6
@@
gfx::ImageSkiaRep IconImage::LoadImageForScaleFactor(
extensions::ImageLoader* loader =
extensions::ImageLoader::Get(browser_context_);
extensions::ImageLoader* loader =
extensions::ImageLoader::Get(browser_context_);
- if (extension_->location() == Manifest::COMPONENT) {
- // bshe's log for http://crbug.com/314872
- LOG(ERROR) << "Start loading extension icon for " << extension_->name()
- << ". scale = " << scale;
- }
-
loader->LoadImagesAsync(extension_, info_list,
base::Bind(&IconImage::OnImageLoaded,
weak_ptr_factory_.GetWeakPtr(),
loader->LoadImagesAsync(extension_, info_list,
base::Bind(&IconImage::OnImageLoaded,
weak_ptr_factory_.GetWeakPtr(),
@@
-214,11
+208,6
@@
void IconImage::OnImageLoaded(float scale, const gfx::Image& image_in) {
const gfx::ImageSkia* image =
image_in.IsEmpty() ? &default_icon_ : image_in.ToImageSkia();
const gfx::ImageSkia* image =
image_in.IsEmpty() ? &default_icon_ : image_in.ToImageSkia();
- if (extension_->location() == Manifest::COMPONENT) {
- // bshe's log for http://crbug.com/314872
- LOG(ERROR) << "Component extension icon for " << extension_->name()
- << " is loaded. scale = " << scale;
- }
// Maybe default icon was not set.
if (image->isNull())
return;
// Maybe default icon was not set.
if (image->isNull())
return;