chrome/browser/supervised_user/supervised_user_navigation_observer.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/supervised_user/supervised_user_navigation_observer.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/supervised_user/supervised_user_navigation_observer.h ('k') | chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_navigation_observer.cc

diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc

index 6a8c34f88bb2a9cd83cf482ab05777d8d87d43d8..a24949b6e38027e22bfc383e31e881681eb181e9 100644

--- a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc

+++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc

@@ -181,7 +181,7 @@ void SupervisedUserNavigationObserver::WarnInfoBarDismissed() {

void SupervisedUserNavigationObserver::DidCommitProvisionalLoadForFrame(

content::RenderFrameHost* render_frame_host,

const GURL& url,

- content::PageTransition transition_type) {

+ ui::PageTransition transition_type) {

if (render_frame_host->GetParent())

return;

@@ -229,7 +229,7 @@ void SupervisedUserNavigationObserver::OnRequestBlockedInternal(

history::HistoryAddPageArgs add_page_args(

url, timestamp, web_contents(), 0,

url, history::RedirectList(),

- content::PAGE_TRANSITION_BLOCKED, history::SOURCE_BROWSED,

+ ui::PAGE_TRANSITION_BLOCKED, history::SOURCE_BROWSED,

false);

// Add the entry to the history database.