diff options
| author | simonhatch@chromium.org <simonhatch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 23:34:21 +0000 |
|---|---|---|
| committer | simonhatch@chromium.org <simonhatch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 23:34:21 +0000 |
| commit | 681b4b88d953e52906a61d7f6a09539e0b8b2e03 (patch) | |
| tree | 9a2dae4b78e805ddad95375279ea538b9411ca92 /chrome/browser/icon_loader_win.cc | |
| parent | dbebe24b6efdcab99bf0674f79c845ff0997fc0c (diff) | |
| download | chromium_src-681b4b88d953e52906a61d7f6a09539e0b8b2e03.zip chromium_src-681b4b88d953e52906a61d7f6a09539e0b8b2e03.tar.gz chromium_src-681b4b88d953e52906a61d7f6a09539e0b8b2e03.tar.bz2 | |
Skip the cached icons if the icon can change (ie. exe/dll/ico on Windows).
BUG=226918
Review URL: https://chromiumcodereview.appspot.com/13812014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_loader_win.cc')
| -rw-r--r-- | chrome/browser/icon_loader_win.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc index e686e73..62cb6f0 100644 --- a/chrome/browser/icon_loader_win.cc +++ b/chrome/browser/icon_loader_win.cc @@ -18,11 +18,14 @@ // 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" || extension == L".dll" || extension == L".ico"; } void IconLoader::ReadIcon() { |