components/dom_distiller/content/distiller_page_web_contents_browsertest.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: components/dom_distiller/content/distiller_page_web_contents_browsertest.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 | « components/autofill/content/renderer/password_autofill_agent.cc ('k') | components/dom_distiller/webui/dom_distiller_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/dom_distiller/content/distiller_page_web_contents_browsertest.cc

diff --git a/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc b/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc

index 612483c194997047a72704e835be6b12f86026de..dd05632dc2d4e8035b8eed9b34ae529d10b15bf1 100644

--- a/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc

+++ b/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc

@@ -140,7 +140,7 @@ class WebContentsMainFrameHelper : public content::WebContentsObserver {

virtual void DidCommitProvisionalLoadForFrame(

content::RenderFrameHost* render_frame_host,

const GURL& url,

- content::PageTransition transition_type) OVERRIDE {

+ ui::PageTransition transition_type) OVERRIDE {

if (wait_for_document_loaded_)

return;

if (!render_frame_host->GetParent())

@@ -332,7 +332,7 @@ void DistillerPageWebContentsTest::RunUseCurrentWebContentsTest(

current_web_contents->GetController().LoadURL(

embedded_test_server()->GetURL(url),

content::Referrer(),

- content::PAGE_TRANSITION_TYPED,

+ ui::PAGE_TRANSITION_TYPED,

std::string());

url_loaded_runner.Run();