diff options
Diffstat (limited to 'chrome/browser/favicon/favicon_tab_helper.h')
| -rw-r--r-- | chrome/browser/favicon/favicon_tab_helper.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h index b0d04fa..4a4aa1b 100644 --- a/chrome/browser/favicon/favicon_tab_helper.h +++ b/chrome/browser/favicon/favicon_tab_helper.h @@ -38,7 +38,7 @@ class FaviconTabHelper : public content::WebContentsObserver, public FaviconDriver, public content::WebContentsUserData<FaviconTabHelper> { public: - virtual ~FaviconTabHelper(); + ~FaviconTabHelper() override; // Initiates loading the favicon for the specified url. void FetchFavicon(const GURL& url); @@ -64,23 +64,23 @@ class FaviconTabHelper : public content::WebContentsObserver, // content::WebContentsObserver override. Must be public, because also // called from PrerenderContents. - virtual void DidUpdateFaviconURL( + void DidUpdateFaviconURL( const std::vector<content::FaviconURL>& candidates) override; // Saves the favicon for the current page. void SaveFavicon(); // FaviconDriver methods. - virtual int StartDownload(const GURL& url, int max_bitmap_size) override; - virtual void NotifyFaviconUpdated(bool icon_url_changed) override; - virtual bool IsOffTheRecord() override; - virtual const gfx::Image GetActiveFaviconImage() override; - virtual const GURL GetActiveFaviconURL() override; - virtual bool GetActiveFaviconValidity() override; - virtual const GURL GetActiveURL() override; - virtual void SetActiveFaviconImage(gfx::Image image) override; - virtual void SetActiveFaviconURL(GURL url) override; - virtual void SetActiveFaviconValidity(bool validity) override; + int StartDownload(const GURL& url, int max_bitmap_size) override; + void NotifyFaviconUpdated(bool icon_url_changed) override; + bool IsOffTheRecord() override; + const gfx::Image GetActiveFaviconImage() override; + const GURL GetActiveFaviconURL() override; + bool GetActiveFaviconValidity() override; + const GURL GetActiveURL() override; + void SetActiveFaviconImage(gfx::Image image) override; + void SetActiveFaviconURL(GURL url) override; + void SetActiveFaviconValidity(bool validity) override; // Favicon download callback. void DidDownloadFavicon( @@ -95,10 +95,10 @@ class FaviconTabHelper : public content::WebContentsObserver, friend class content::WebContentsUserData<FaviconTabHelper>; // content::WebContentsObserver overrides. - virtual void DidStartNavigationToPendingEntry( + void DidStartNavigationToPendingEntry( const GURL& url, content::NavigationController::ReloadType reload_type) override; - virtual void DidNavigateMainFrame( + void DidNavigateMainFrame( const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) override; |