chrome/browser/ui/search/search_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/ui/search/search_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/ui/search/instant_search_prerenderer_unittest.cc ('k') | chrome/browser/ui/search_engines/search_engine_tab_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/search/search_tab_helper.cc

diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc

index d479c98fc15215bb81b62127faf500945eeec91b..c4ec74cc160024f1a2fcf7638f095f7bc0c9743c 100644

--- a/chrome/browser/ui/search/search_tab_helper.cc

+++ b/chrome/browser/ui/search/search_tab_helper.cc

@@ -45,10 +45,10 @@

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/browser/web_contents.h"

-#include "content/public/common/page_transition_types.h"

#include "content/public/common/referrer.h"

#include "net/base/net_errors.h"

#include "ui/base/l10n/l10n_util.h"

+#include "ui/base/page_transition_types.h"

#include "url/gurl.h"

DEFINE_WEB_CONTENTS_USER_DATA_KEY(SearchTabHelper);

@@ -620,7 +620,7 @@ void SearchTabHelper::RedirectToLocalNTP() {

content::NavigationController::LoadURLParams load_params(

(GURL(chrome::kChromeSearchLocalNtpUrl)));

load_params.referrer = content::Referrer();

- load_params.transition_type = content::PAGE_TRANSITION_SERVER_REDIRECT;

+ load_params.transition_type = ui::PAGE_TRANSITION_SERVER_REDIRECT;

// Don't push a history entry.

load_params.should_replace_current_entry = true;

web_contents_->GetController().LoadURLWithParams(load_params);