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

Unified Diff: chrome/browser/icon_loader_chromeos.cc

Issue 12211049: Removing base::ThreadRestrictions::ScopedAllowIO from icon_manager_linux.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review changes. Created 7 years, 10 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/icon_loader_chromeos.cc
diff --git a/chrome/browser/icon_loader_chromeos.cc b/chrome/browser/icon_loader_chromeos.cc
index 100f1ac1c4c958f9e4f35eaf1c0bbdead3271850..adee539757da22057afbbca5bb0ea762bafd95fd 100644
--- a/chrome/browser/icon_loader_chromeos.cc
+++ b/chrome/browser/icon_loader_chromeos.cc
@@ -177,15 +177,15 @@ int IconSizeToDIPSize(IconLoader::IconSize size) {
} // namespace
-void IconLoader::ReadIcon() {
+void IconLoader::ReadIcon(const IconGroupID& group) {
static base::LazyInstance<IconMapper>::Leaky icon_mapper =
LAZY_INSTANCE_INITIALIZER;
- int idr = icon_mapper.Get().Lookup(group_, icon_size_);
+ int idr = icon_mapper.Get().Lookup(group, icon_size_);
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(),
IconSizeToDIPSize(icon_size_)));
image_skia.MakeThreadSafe();
image_.reset(new gfx::Image(image_skia));
target_message_loop_->PostTask(
- FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
+ FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this, group));
}

Powered by Google App Engine
This is Rietveld 408576698