summaryrefslogtreecommitdiffstats
path: root/chrome/browser/favicon
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 18:53:04 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 18:53:04 +0000
commita6e16aec4396d90867fd9807b07b4e457a95f941 (patch)
tree9db83ecf9b80e1b1200fc42e57ac42f931e12275 /chrome/browser/favicon
parentfcf3aa58fa480b208fe305b081e1dc673840fe92 (diff)
downloadchromium_src-a6e16aec4396d90867fd9807b07b4e457a95f941.zip
chromium_src-a6e16aec4396d90867fd9807b07b4e457a95f941.tar.gz
chromium_src-a6e16aec4396d90867fd9807b07b4e457a95f941.tar.bz2
Switch BackgroundContents to use TabContents instead of RenderViewHost.
BUG=99698, 98934 Review URL: http://codereview.chromium.org/8469015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon')
-rw-r--r--chrome/browser/favicon/favicon_tab_helper.cc2
-rw-r--r--chrome/browser/favicon/favicon_tab_helper.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc
index 967d1a1..3501893 100644
--- a/chrome/browser/favicon/favicon_tab_helper.cc
+++ b/chrome/browser/favicon/favicon_tab_helper.cc
@@ -157,7 +157,7 @@ void FaviconTabHelper::NavigateToPendingEntry(
}
}
-void FaviconTabHelper::DidNavigateMainFramePostCommit(
+void FaviconTabHelper::DidNavigateMainFrame(
const content::LoadCommittedDetails& details,
const ViewHostMsg_FrameNavigate_Params& params) {
// Get the favicon, either from history or request it from the net.
diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h
index 97e8d63..9247415 100644
--- a/chrome/browser/favicon/favicon_tab_helper.h
+++ b/chrome/browser/favicon/favicon_tab_helper.h
@@ -82,7 +82,7 @@ class FaviconTabHelper : public TabContentsObserver,
virtual void NavigateToPendingEntry(
const GURL& url,
NavigationController::ReloadType reload_type) OVERRIDE;
- virtual void DidNavigateMainFramePostCommit(
+ virtual void DidNavigateMainFrame(
const content::LoadCommittedDetails& details,
const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;