diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 05:09:04 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 05:09:04 +0000 |
| commit | 69cda6547de3c2bc25e6476607e7550ba548cac9 (patch) | |
| tree | e54f39838f04e0e61921cd7457711019be8b545f /chrome/browser/favicon | |
| parent | c691a593ac199d774a43f239342cd85c80ca1a2a (diff) | |
| download | chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.zip chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.tar.gz chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.tar.bz2 | |
Rename TabContents::controller() to GetController and put it into the WebContents namespace.
BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon')
| -rw-r--r-- | chrome/browser/favicon/favicon_tab_helper.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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) { |