diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 17:52:03 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 17:52:03 +0000 |
| commit | 16be5c3ac774c21bfa88ec0582137d745f07572d (patch) | |
| tree | c7ba676f4ec573b80c703fe3343b9332472f6aeb /content/browser | |
| parent | d2d63be523cbd238e11e160d904bcb351fdfb9e8 (diff) | |
| download | chromium_src-16be5c3ac774c21bfa88ec0582137d745f07572d.zip chromium_src-16be5c3ac774c21bfa88ec0582137d745f07572d.tar.gz chromium_src-16be5c3ac774c21bfa88ec0582137d745f07572d.tar.bz2 | |
fav icon -> favicon. Pass 5: fav_icon -> favicon
BUG=76073
TEST=none; no visible change
Review URL: http://codereview.chromium.org/6693021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 4 | ||||
| -rw-r--r-- | content/browser/tab_contents/tab_contents.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index b4900ac..0c62335 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -389,7 +389,7 @@ TabContents::~TabContents() { void TabContents::AddObservers() { printing_.reset(new printing::PrintViewManager(this)); print_preview_.reset(new printing::PrintPreviewMessageHandler(this)); - fav_icon_helper_.reset(new FaviconHelper(this)); + favicon_helper_.reset(new FaviconHelper(this)); autofill_manager_.reset(new AutofillManager(this)); autocomplete_history_manager_.reset(new AutocompleteHistoryManager(this)); desktop_notification_handler_.reset( @@ -1667,7 +1667,7 @@ void TabContents::DidNavigateMainFramePostCommit( received_page_title_ = false; // Get the favicon, either from history or request it from the net. - fav_icon_helper_->FetchFavicon(details.entry->url()); + favicon_helper_->FetchFavicon(details.entry->url()); // Clear all page actions, blocked content notifications and browser actions // for this tab, unless this is an in-page navigation. diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 2078ab6..5638822 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -182,8 +182,8 @@ class TabContents : public PageNavigator, } // Returns the FaviconHelper of this TabContents. - FaviconHelper& fav_icon_helper() { - return *fav_icon_helper_.get(); + FaviconHelper& favicon_helper() { + return *favicon_helper_.get(); } // App extensions ------------------------------------------------------------ @@ -1080,7 +1080,7 @@ class TabContents : public PageNavigator, BookmarkDrag* bookmark_drag_; // Handles downloading favicons. - scoped_ptr<FaviconHelper> fav_icon_helper_; + scoped_ptr<FaviconHelper> favicon_helper_; // Cached web app info data. WebApplicationInfo web_app_info_; |