chrome/browser/tab_contents/language_state.cc - Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

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/tab_contents/language_state.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 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/tab_contents/insecure_content_infobar_delegate.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tab_contents/language_state.cc

===================================================================

--- chrome/browser/tab_contents/language_state.cc (revision 105162)

+++ chrome/browser/tab_contents/language_state.cc (working copy)

@@ -24,8 +24,9 @@

if (in_page_navigation_ || !details.is_main_frame)

return; // Don't reset our states, the page has not changed.

- bool reload = details.entry->transition_type() == PageTransition::RELOAD ||

- details.type == NavigationType::SAME_PAGE;

+ bool reload =

+ details.entry->transition_type() == content::PAGE_TRANSITION_RELOAD ||

+ details.type == NavigationType::SAME_PAGE;

if (reload) {

// We might not get a LanguageDetermined notifications on reloads. Make sure

// to keep the original language and to set current_lang_ so

@@ -68,7 +69,7 @@

original_lang_ == current_lang_ &&

navigation_controller_->GetActiveEntry() &&

navigation_controller_->GetActiveEntry()->transition_type() ==

- PageTransition::LINK) {

+ content::PAGE_TRANSITION_LINK) {

return prev_current_lang_;

}