Index: chrome/browser/icon_loader_win.cc |
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc |
index e686e730b2d696cb6f5e6cd31f048a3a26e25a34..a69413a1ac4e482de8d7fdeaa0cc9c38b3ec1534 100644 |
--- a/chrome/browser/icon_loader_win.cc |
+++ b/chrome/browser/icon_loader_win.cc |
@@ -18,11 +18,15 @@ |
// static |
IconGroupID IconLoader::ReadGroupIDFromFilepath( |
const base::FilePath& filepath) { |
+ if (!IsIconMutableFromFilepath(filepath)) |
+ return filepath.Extension(); |
+ return filepath.value(); |
+} |
+ |
+bool IconLoader::IsIconMutableFromFilepath(const base::FilePath& filepath) { |
base::FilePath::StringType extension = filepath.Extension(); |
- if (extension != L".exe" && extension != L".dll" && extension != L".ico") |
- return extension; |
- else |
- return filepath.value(); |
+ return (extension == L".exe" || |
Robert Sesek
2013/04/09 20:44:10
nit: no () around return expressions
|
+ extension == L".dll" || extension == L".ico"); |
} |
void IconLoader::ReadIcon() { |