chrome/browser/captive_portal/captive_portal_tab_helper.cc - Issue 562603002: Move PageTransition from //content/public/common to //ui/base

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/captive_portal/captive_portal_tab_helper.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 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/captive_portal/captive_portal_tab_helper.h ('k') | chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/captive_portal/captive_portal_tab_helper.cc

diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.cc b/chrome/browser/captive_portal/captive_portal_tab_helper.cc

index 2d2c1e18dd83479c83cfe149a92843ce37d5d3a0..bd4895ba17342cc89d57e098a669ab17a8d0c978 100644

--- a/chrome/browser/captive_portal/captive_portal_tab_helper.cc

+++ b/chrome/browser/captive_portal/captive_portal_tab_helper.cc

@@ -100,7 +100,7 @@ void CaptivePortalTabHelper::DidStartProvisionalLoadForFrame(

void CaptivePortalTabHelper::DidCommitProvisionalLoadForFrame(

content::RenderFrameHost* render_frame_host,

const GURL& url,

- content::PageTransition transition_type) {

+ ui::PageTransition transition_type) {

DCHECK(CalledOnValidThread());

// Ignore subframes.

@@ -260,7 +260,7 @@ void CaptivePortalTabHelper::OpenLoginTab() {

content::WebContents* web_contents = chrome::AddSelectedTabWithURL(

browser,

CaptivePortalServiceFactory::GetForProfile(profile_)->test_url(),

- content::PAGE_TRANSITION_TYPED);

+ ui::PAGE_TRANSITION_TYPED);

CaptivePortalTabHelper* captive_portal_tab_helper =

CaptivePortalTabHelper::FromWebContents(web_contents);

captive_portal_tab_helper->SetIsLoginTab();