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 /chrome/browser/autocomplete | |
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 'chrome/browser/autocomplete')
-rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit.cc | 2 | ||||
-rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit.h | 2 | ||||
-rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_unittest.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 536629c..b52a0af 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -234,7 +234,7 @@ void AutocompleteEditModel::GetDataForURLExport(GURL* url, if (*url == URLFixerUpper::FixupURL(UTF16ToUTF8(permanent_text_), std::string())) { *title = controller_->GetTitle(); - *favicon = controller_->GetFavIcon(); + *favicon = controller_->GetFavicon(); } } diff --git a/chrome/browser/autocomplete/autocomplete_edit.h b/chrome/browser/autocomplete/autocomplete_edit.h index 2ea41b8..41e05e9 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.h +++ b/chrome/browser/autocomplete/autocomplete_edit.h @@ -69,7 +69,7 @@ class AutocompleteEditController { virtual void OnSetFocus() = 0; // Returns the favicon of the current page. - virtual SkBitmap GetFavIcon() const = 0; + virtual SkBitmap GetFavicon() const = 0; // Returns the title of the current page. virtual string16 GetTitle() const = 0; diff --git a/chrome/browser/autocomplete/autocomplete_edit_unittest.cc b/chrome/browser/autocomplete/autocomplete_edit_unittest.cc index c915f751..2a51f91 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_unittest.cc @@ -82,7 +82,7 @@ class TestingAutocompleteEditController : public AutocompleteEditController { virtual void OnInputInProgress(bool in_progress) OVERRIDE {} virtual void OnKillFocus() OVERRIDE {} virtual void OnSetFocus() OVERRIDE {} - virtual SkBitmap GetFavIcon() const OVERRIDE { return SkBitmap(); } + virtual SkBitmap GetFavicon() const OVERRIDE { return SkBitmap(); } virtual string16 GetTitle() const OVERRIDE { return string16(); } virtual InstantController* GetInstant() OVERRIDE { return NULL; } virtual TabContentsWrapper* GetTabContentsWrapper() OVERRIDE { |