diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 14:42:27 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 14:42:27 +0000 |
| commit | 9b488bda307fc224779706660915e8ac25d0eb8a (patch) | |
| tree | 6c650aee74463b4dbc26d6d6cafd48656291c5c7 /content | |
| parent | acc9c371d618e9a3c4c52c899423e20cb114c5b7 (diff) | |
| download | chromium_src-9b488bda307fc224779706660915e8ac25d0eb8a.zip chromium_src-9b488bda307fc224779706660915e8ac25d0eb8a.tar.gz chromium_src-9b488bda307fc224779706660915e8ac25d0eb8a.tar.bz2 | |
fav icon -> favicon. Pass 2: GetFavIcon -> GetFavicon
BUG=76073
TEST=none; no visible change
Review URL: http://codereview.chromium.org/6685059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 2 | ||||
| -rw-r--r-- | content/browser/tab_contents/tab_contents.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index ad38eed..b4900ac 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -575,7 +575,7 @@ bool TabContents::ShouldDisplayURL() { return true; } -SkBitmap TabContents::GetFavIcon() const { +SkBitmap TabContents::GetFavicon() const { // Like GetTitle(), we also want to use the favicon for the last committed // entry rather than a pending navigation entry. NavigationEntry* entry = controller_.GetTransientEntry(); diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index ae7b865..169b172 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -243,7 +243,7 @@ class TabContents : public PageNavigator, // 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. - SkBitmap GetFavIcon() const; + SkBitmap GetFavicon() const; // Returns true if we are not using the default favicon. bool FavIconIsValid() const; |