summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 15:52:27 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 15:52:27 +0000
commitc9e2a17bc8e0362a89fa0ceb50228eb29396c009 (patch)
tree94975f121b3376f486aa70d364cf2e8f6bac0264 /content
parent530cd6292136de5798bfd05c4ae960cba8e8b84b (diff)
downloadchromium_src-c9e2a17bc8e0362a89fa0ceb50228eb29396c009.zip
chromium_src-c9e2a17bc8e0362a89fa0ceb50228eb29396c009.tar.gz
chromium_src-c9e2a17bc8e0362a89fa0ceb50228eb29396c009.tar.bz2
[Mac] Replace instances of IDR_DEFAULT_FAVICON with nav.pdf.
The PNG is a rasterized version of the PDF, so the colors are slightly different. Some parts of the UI use the PDF and others use the PNG. This CL reconciles that usage to always use the PDF for a consistent look. BUG=27626 TEST=visual Review URL: http://codereview.chromium.org/6812027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/tab_contents/tab_contents.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 85960f2..de53285 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -198,9 +198,10 @@ class TabContents : public PageNavigator,
// the user is invited to type into it.
virtual bool ShouldDisplayURL();
- // Returns the favicon for this tab, or an isNull() bitmap if the tab does not
- // have a favicon. The default implementation uses the current navigation
- // entry.
+ // Returns the favicon for this tab, or IDR_DEFAULT_FAVICON if the tab does
+ // not have a favicon. The default implementation uses the current navigation
+ // entry. This will return an isNull bitmap if there are no navigation
+ // entries, which should rarely happen.
SkBitmap GetFavicon() const;
// Returns true if we are not using the default favicon.