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

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: Changes from review. Created 7 years, 9 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..6d24c9896f5074634ebeb8226ef6e38edfa9d4ec 100644
--- a/chrome/browser/icon_loader_win.cc
+++ b/chrome/browser/icon_loader_win.cc
@@ -15,6 +15,15 @@
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/size.h"
+IconGroupID IconLoader::ReadGroupIDFromFilepath(
+ const base::FilePath& filepath) {
+ std::wstring extension = filepath.Extension();
+ if (extension != L".exe" && extension != L".dll" && extension != L".ico")
+ return extension;
+ else
+ return filepath.value();
+}
+
void IconLoader::ReadIcon() {
int size = 0;
switch (icon_size_) {

Powered by Google App Engine
This is Rietveld 408576698