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

Unified Diff: chrome/browser/icon_loader_win.cc

Issue 2440273002: Clean up the IconLoader. (Closed)
Patch Set: nits Created 4 years 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
« no previous file with comments | « chrome/browser/icon_loader_mac.mm ('k') | chrome/browser/icon_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/icon_loader_win.cc
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc
index 759088d34b9d6fabeaaae8b66ec221861883065d..0ce1c2190f2e3f61e63558eb36512a4247729510 100644
--- a/chrome/browser/icon_loader_win.cc
+++ b/chrome/browser/icon_loader_win.cc
@@ -17,18 +17,15 @@
#include "ui/gfx/image/image_skia.h"
// static
-IconGroupID IconLoader::ReadGroupIDFromFilepath(
- const base::FilePath& filepath) {
- if (!IsIconMutableFromFilepath(filepath))
- return filepath.Extension();
- return filepath.value();
-}
+IconLoader::IconGroup IconLoader::GroupForFilepath(
+ const base::FilePath& file_path) {
+ if (file_path.MatchesExtension(L".exe") ||
+ file_path.MatchesExtension(L".dll") ||
+ file_path.MatchesExtension(L".ico")) {
+ return file_path.value();
+ }
-// static
-bool IconLoader::IsIconMutableFromFilepath(const base::FilePath& filepath) {
- return filepath.MatchesExtension(L".exe") ||
- filepath.MatchesExtension(L".dll") ||
- filepath.MatchesExtension(L".ico");
+ return file_path.Extension();
}
// static
« no previous file with comments | « chrome/browser/icon_loader_mac.mm ('k') | chrome/browser/icon_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698