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

Unified Diff: chrome/browser/icon_loader_linux.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_linux.cc
diff --git a/chrome/browser/icon_loader_linux.cc b/chrome/browser/icon_loader_linux.cc
index 9edbd9cf55c97207260846a6c1ea2e946317e7f3..078e9a70aca59988e056d2bc9e2bef6c8e661ff8 100644
--- a/chrome/browser/icon_loader_linux.cc
+++ b/chrome/browser/icon_loader_linux.cc
@@ -17,7 +17,7 @@
using std::string;
-void IconLoader::ReadIcon() {
+void IconLoader::ReadIcon(const IconGroupID& group) {
int size_pixels = 0;
switch (icon_size_) {
case IconLoader::SMALL:
@@ -33,7 +33,7 @@ void IconLoader::ReadIcon() {
NOTREACHED();
}
- FilePath filename = base::nix::GetMimeIcon(group_, size_pixels);
+ FilePath filename = base::nix::GetMimeIcon(group, size_pixels);
// We don't support SVG icons; this just spams the terminal so fail quickly
// and don't try to read the file from disk first.
if (filename.Extension() != ".svg") {
@@ -58,5 +58,5 @@ void IconLoader::ReadIcon() {
}
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