diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 16:08:21 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 16:08:21 +0000 |
| commit | 2a023ab22ac143c9ab37dab516f31737d68756c5 (patch) | |
| tree | 93469baad043aa98825f2bca494b780051b8c2ee /chrome | |
| parent | fa20a0d28b66a1930e31267d4314c6be72f76813 (diff) | |
| download | chromium_src-2a023ab22ac143c9ab37dab516f31737d68756c5.zip chromium_src-2a023ab22ac143c9ab37dab516f31737d68756c5.tar.gz chromium_src-2a023ab22ac143c9ab37dab516f31737d68756c5.tar.bz2 | |
Give any available icon out for request touch_icon://
Instead of just returning TOUCH_PRECOMPOSED_ICON or TOUCH_ICON,
Give any available icon out for request touch_icon://
in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON, FAVICON
and default favicon.
As the touch icon feature is disabled in chromium, this patch doesn't have real change.
BUG=71571
TEST=Existent unit tests.
Review URL: http://codereview.chromium.org/7048019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/webui/favicon_source.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/favicon_source.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index 09b9f55..846c5f0 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -16,7 +16,8 @@ FaviconSource::FaviconSource(Profile* profile, IconType type) MessageLoop::current()), profile_(profile->GetOriginalProfile()), icon_types_(type == FAVICON ? history::FAVICON : - history::TOUCH_PRECOMPOSED_ICON | history::TOUCH_ICON) { + history::TOUCH_PRECOMPOSED_ICON | history::TOUCH_ICON | + history::FAVICON) { } FaviconSource::~FaviconSource() { diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h index 2121b28..413e3d9 100644 --- a/chrome/browser/ui/webui/favicon_source.h +++ b/chrome/browser/ui/webui/favicon_source.h @@ -23,7 +23,9 @@ class FaviconSource : public ChromeURLDataManager::DataSource { // Defines the type of icon the FaviconSource will provide. enum IconType { FAVICON, - TOUCH + // Any available icon in the priority of TOUCH_ICON_PRECOMPOSED, TOUCH_ICON, + // FAVICON, and default favicon. + ANY }; // |type| is the type of icon this FaviconSource will provide. |