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

Unified Diff: chrome/browser/icon_loader_win.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_win.cc
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc
index 7aa1455f8539ad7e654e07399ac4ca072757292d..cd453c3547eef752b74a51dba2f5acc01b27f509 100644
--- a/chrome/browser/icon_loader_win.cc
+++ b/chrome/browser/icon_loader_win.cc
@@ -15,7 +15,7 @@
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/size.h"
-void IconLoader::ReadIcon() {
+void IconLoader::ReadIcon(const IconGroupID& group) {
int size = 0;
switch (icon_size_) {
case IconLoader::SMALL:
@@ -34,7 +34,7 @@ void IconLoader::ReadIcon() {
image_.reset();
SHFILEINFO file_info = { 0 };
- if (SHGetFileInfo(group_.c_str(), FILE_ATTRIBUTE_NORMAL, &file_info,
+ if (SHGetFileInfo(group.c_str(), FILE_ATTRIBUTE_NORMAL, &file_info,
sizeof(SHFILEINFO),
SHGFI_ICON | size | SHGFI_USEFILEATTRIBUTES)) {
scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(
@@ -49,5 +49,5 @@ void IconLoader::ReadIcon() {
// Always notify the delegate, regardless of success.
target_message_loop_->PostTask(FROM_HERE,
- base::Bind(&IconLoader::NotifyDelegate, this));
+ base::Bind(&IconLoader::NotifyDelegate, this, group));
}

Powered by Google App Engine
This is Rietveld 408576698