chrome/browser/favicon/favicon_tab_helper.h - Issue 261403003: Removes usage of NavigationEntry from favicon_handler.*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/favicon/favicon_tab_helper.h

Issue 261403003: Removes usage of NavigationEntry from favicon_handler.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/favicon/favicon_handler.cc ('K') | « chrome/browser/favicon/favicon_handler.cc ('k') | chrome/browser/favicon/favicon_tab_helper.cc » ('j') | chrome/browser/favicon/favicon_tab_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/favicon/favicon_tab_helper.h

diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h

index 9450b0c4e928db594fc1eb76b4ed783df0fb4df4..5a6c8cc6992c04d2fda695767be83c8bcc2f3f0f 100644

--- a/chrome/browser/favicon/favicon_tab_helper.h

+++ b/chrome/browser/favicon/favicon_tab_helper.h

@@ -72,6 +72,12 @@ class FaviconTabHelper : public content::WebContentsObserver,

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 GURL GetActiveURL() OVERRIDE;

+ virtual const GURL GetActiveFaviconURL() OVERRIDE;

+ virtual bool GetActiveFaviconValidity() OVERRIDE;

+ virtual void SetActiveFaviconValidity(bool validity) OVERRIDE;

+ virtual void SetActiveFaviconImage(gfx::Image image) OVERRIDE;

+ virtual void SetActiveFaviconURL(GURL url) OVERRIDE;

// Favicon download callback.

void DidDownloadFavicon(