| 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
|
|
|