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

Unified Diff: chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc

Issue 10699065: chromeos: Fix pixelated icons in app list and launcher (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for comments in #2 Created 8 years, 5 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/views/ash/launcher/launcher_app_icon_loader.cc
diff --git a/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc b/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
index 83f22bfe0568f4ce81dd7d0ee9b136d7d17ad352..a429f61eec51366526502c5892d6a133ebbbb90a 100644
--- a/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
+++ b/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
@@ -44,10 +44,10 @@ void LauncherAppIconLoader::FetchImage(const std::string& id) {
if (!image_loader_.get())
image_loader_.reset(new ImageLoadingTracker(this));
map_[image_loader_->next_id()] = id;
- image_loader_->LoadImage(
+
+ image_loader_->LoadDIPImage(
extension,
- extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_SMALL,
- ExtensionIconSet::MATCH_BIGGER),
+ ExtensionIconSet::EXTENSION_ICON_SMALL,
gfx::Size(ExtensionIconSet::EXTENSION_ICON_SMALL,
ExtensionIconSet::EXTENSION_ICON_SMALL),
ImageLoadingTracker::CACHE);
@@ -63,9 +63,9 @@ void LauncherAppIconLoader::OnImageLoaded(const gfx::Image& image,
std::string id = i->second;
map_.erase(i);
if (image.IsEmpty())
- host_->SetAppImage(id, NULL);
+ host_->SetAppImage(id, extensions::Extension::GetDefaultIcon(true));
else
- host_->SetAppImage(id, image.ToSkBitmap());
+ host_->SetAppImage(id, *image.ToImageSkia());
}
const extensions::Extension* LauncherAppIconLoader::GetExtensionForTab(

Powered by Google App Engine
This is Rietveld 408576698