components/favicon/content/content_favicon_driver.h - Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file

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: components/favicon/content/content_favicon_driver.h

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: [rebase] Created 4 years, 3 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

« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.cc ('k') | components/favicon/content/content_favicon_driver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/favicon/content/content_favicon_driver.h

diff --git a/components/favicon/content/content_favicon_driver.h b/components/favicon/content/content_favicon_driver.h

index 3405c67a0772442664f2324974070516ee36aa7d..70d3c4fdacf744db2bec6dec1c2e19c85cfbcc5c 100644

--- a/components/favicon/content/content_favicon_driver.h

+++ b/components/favicon/content/content_favicon_driver.h

@@ -7,6 +7,7 @@

#include "base/macros.h"

#include "components/favicon/core/favicon_driver_impl.h"

+#include "content/public/browser/reload_type.h"

#include "content/public/browser/web_contents_observer.h"

#include "content/public/browser/web_contents_user_data.h"

#include "url/gurl.h"

@@ -72,7 +73,7 @@ class ContentFaviconDriver

const std::vector<content::FaviconURL>& candidates) override;

void DidStartNavigationToPendingEntry(

const GURL& url,

- content::NavigationController::ReloadType reload_type) override;

+ content::ReloadType reload_type) override;

void DidNavigateMainFrame(

const content::LoadCommittedDetails& details,

const content::FrameNavigateParams& params) override;