chrome/browser/ui/toolbar/toolbar_model_unittest.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/ui/toolbar/toolbar_model_unittest.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/ui/toolbar/toolbar_model_impl.cc ('k') | chrome/browser/ui/views/accessibility/invert_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/toolbar_model_unittest.cc

diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc

index 063b171fc26d075f4adc13df8b62e96a7eea4068..a3f534e85bd70391b1cba600e0554ae1dfe9fbe3 100644

--- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc

+++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc

@@ -199,7 +199,7 @@ void ToolbarModelTest::NavigateAndCheckText(

// Check while loading.

content::NavigationController* controller =

&browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();

- controller->LoadURL(url, content::Referrer(), content::PAGE_TRANSITION_LINK,

+ controller->LoadURL(url, content::Referrer(), ui::PAGE_TRANSITION_LINK,

std::string());

ToolbarModel* toolbar_model = browser()->toolbar_model();

EXPECT_EQ(expected_text, toolbar_model->GetText());

@@ -331,7 +331,7 @@ TEST_F(ToolbarModelTest, SearchTermsWhileLoading) {

content::NavigationController* controller =

&browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();

controller->LoadURL(GURL("https://google.com/search?q=tractor+supply&espv=1"),

- content::Referrer(), content::PAGE_TRANSITION_LINK,

+ content::Referrer(), ui::PAGE_TRANSITION_LINK,

std::string());

ToolbarModel* toolbar_model = browser()->toolbar_model();

controller->GetVisibleEntry()->GetSSL().security_style =

« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_impl.cc ('k') | chrome/browser/ui/views/accessibility/invert_bubble_view.cc » ('j') | no next file with comments »