components/translate/content/browser/content_translate_driver.cc - 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/translate/content/browser/content_translate_driver.cc

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, 4 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 | « components/favicon/content/content_favicon_driver.cc ('k') | content/browser/android/web_contents_observer_proxy.h » ('j') | content/browser/frame_host/navigation_controller_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/translate/content/browser/content_translate_driver.cc

diff --git a/components/translate/content/browser/content_translate_driver.cc b/components/translate/content/browser/content_translate_driver.cc

index 24376c16d711385043017b4f44e6a4e94396375c..e489f063c5b3ad6ce12355f096714bcd0128b080 100644

--- a/components/translate/content/browser/content_translate_driver.cc

+++ b/components/translate/content/browser/content_translate_driver.cc

@@ -178,7 +178,7 @@ void ContentTranslateDriver::NavigationEntryCommitted(

// If not a reload, return.

if (!ui::PageTransitionCoreTypeIs(entry->GetTransitionType(),

ui::PAGE_TRANSITION_RELOAD) &&

- load_details.type != content::NAVIGATION_TYPE_SAME_PAGE) {

+ load_details.type != content::NavigationType::SAME_PAGE) {

return;

}

@@ -205,7 +205,7 @@ void ContentTranslateDriver::DidNavigateAnyFrame(

const bool reload =

ui::PageTransitionCoreTypeIs(details.entry->GetTransitionType(),

ui::PAGE_TRANSITION_RELOAD) ||

- details.type == content::NAVIGATION_TYPE_SAME_PAGE;

+ details.type == content::NavigationType::SAME_PAGE;

translate_manager_->GetLanguageState().DidNavigate(

details.is_in_page, details.is_main_frame, reload);

}