Index: chrome/browser/icon_manager.h |
diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h |
index 875c6d8ac15e770239a9d391d02fc0d0c34f7d42..60cabb0a591c8d6d1a6370d39e6fd355ea7ad746 100644 |
--- a/chrome/browser/icon_manager.h |
+++ b/chrome/browser/icon_manager.h |
@@ -47,14 +47,11 @@ |
#include <map> |
+#include "base/file_path.h" |
#include "chrome/browser/icon_loader.h" |
#include "chrome/common/cancelable_task_tracker.h" |
#include "ui/gfx/image/image.h" |
-namespace base { |
-class FilePath; |
-} |
- |
class IconManager : public IconLoader::Delegate { |
public: |
IconManager(); |
@@ -65,7 +62,8 @@ class IconManager : public IconLoader::Delegate { |
// it via 'LoadIcon'. The returned bitmap is owned by the IconManager and must |
// not be free'd by the caller. If the caller needs to modify the icon, it |
// must make a copy and modify the copy. |
- gfx::Image* LookupIcon(const base::FilePath& file_name, IconLoader::IconSize size); |
+ gfx::Image* LookupIconFromFilepath(const base::FilePath& file_name, |
+ IconLoader::IconSize size); |
typedef base::Callback<void(gfx::Image*)> IconRequestCallback; |
@@ -89,16 +87,16 @@ class IconManager : public IconLoader::Delegate { |
// Get the identifying string for the given file. The implementation |
// is in icon_manager_[platform].cc. |
- static IconGroupID GetGroupIDFromFilepath(const base::FilePath& path); |
+ static IconGroupID ReadGroupIDFromFilepath(const base::FilePath& path); |
private: |
struct CacheKey { |
- CacheKey(const IconGroupID& group, IconLoader::IconSize size); |
+ CacheKey(const base::FilePath& file_name, IconLoader::IconSize size); |
Robert Sesek
2013/02/11 20:52:23
I think this change will result in many more cache
|
// Used as a key in the map below, so we need this comparator. |
bool operator<(const CacheKey &other) const; |
- IconGroupID group; |
+ base::FilePath file_name; |
IconLoader::IconSize size; |
}; |