From f5fa20e471b2fc9bb18f6f673146704483d0b18e Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Wed, 21 Dec 2011 22:35:56 +0000 Subject: Revert 115346. The change didn't break anything, the test was faulty. Will disable in a followup. - Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests on win,linux,mac. Original change: Rename TabContents::controller() to GetController and put it into the WebContents namespace. BUG=98716 TBR=dpranke Review URL: http://codereview.chromium.org/8956050 TBR=jam Review URL: http://codereview.chromium.org/9018016 TBR=thakis@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115428 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/favicon/favicon_tab_helper.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'chrome/browser/favicon') diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc index b6402d4..8df87aa 100644 --- a/chrome/browser/favicon/favicon_tab_helper.cc +++ b/chrome/browser/favicon/favicon_tab_helper.cc @@ -42,7 +42,7 @@ void FaviconTabHelper::FetchFavicon(const GURL& url) { SkBitmap FaviconTabHelper::GetFavicon() const { // Like GetTitle(), we also want to use the favicon for the last committed // entry rather than a pending navigation entry. - const NavigationController& controller = tab_contents()->controller(); + const NavigationController& controller = tab_contents()->GetController(); NavigationEntry* entry = controller.GetTransientEntry(); if (entry) return entry->favicon().bitmap(); @@ -54,7 +54,7 @@ SkBitmap FaviconTabHelper::GetFavicon() const { } bool FaviconTabHelper::FaviconIsValid() const { - const NavigationController& controller = tab_contents()->controller(); + const NavigationController& controller = tab_contents()->GetController(); NavigationEntry* entry = controller.GetTransientEntry(); if (entry) return entry->favicon().is_valid(); @@ -68,7 +68,7 @@ bool FaviconTabHelper::FaviconIsValid() const { bool FaviconTabHelper::ShouldDisplayFavicon() { // Always display a throbber during pending loads. - const NavigationController& controller = tab_contents()->controller(); + const NavigationController& controller = tab_contents()->GetController(); if (controller.GetLastCommittedEntry() && controller.pending_entry()) return true; @@ -79,7 +79,7 @@ bool FaviconTabHelper::ShouldDisplayFavicon() { } void FaviconTabHelper::SaveFavicon() { - NavigationEntry* entry = tab_contents()->controller().GetActiveEntry(); + NavigationEntry* entry = tab_contents()->GetController().GetActiveEntry(); if (!entry || entry->url().is_empty()) return; @@ -128,7 +128,7 @@ void FaviconTabHelper::OnUpdateFaviconURL( } NavigationEntry* FaviconTabHelper::GetActiveEntry() { - return tab_contents()->controller().GetActiveEntry(); + return tab_contents()->GetController().GetActiveEntry(); } void FaviconTabHelper::StartDownload(int id, const GURL& url, int image_size) { -- cgit v1.1