chrome/browser/ui/extensions/application_launch.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/extensions/application_launch.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/cocoa/website_settings/website_settings_bubble_controller.mm ('k') | chrome/browser/ui/extensions/extension_install_ui_default.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/extensions/application_launch.cc

diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc

index 34725c31a10bb6b43eec3b7ae9e097682d7c305e..140751f6bec00393ca22f3b3c5a998f4e795dbd9 100644

--- a/chrome/browser/ui/extensions/application_launch.cc

+++ b/chrome/browser/ui/extensions/application_launch.cc

@@ -182,7 +182,7 @@ WebContents* OpenApplicationWindow(const AppLaunchParams& params) {

Browser* browser = new Browser(browser_params);

WebContents* web_contents = chrome::AddSelectedTabWithURL(

- browser, url, content::PAGE_TRANSITION_AUTO_TOPLEVEL);

+ browser, url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL);

web_contents->GetMutableRendererPrefs()->can_accept_load_drops = false;

web_contents->GetRenderViewHost()->SyncRendererPrefs();

@@ -228,7 +228,7 @@ WebContents* OpenApplicationTab(const AppLaunchParams& launch_params) {

GURL extension_url = UrlForExtension(extension, launch_params.override_url);

chrome::NavigateParams params(browser, extension_url,

- content::PAGE_TRANSITION_AUTO_TOPLEVEL);

+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL);

params.tabstrip_add_types = add_type;

params.disposition = disposition;

@@ -242,7 +242,7 @@ WebContents* OpenApplicationTab(const AppLaunchParams& launch_params) {

extension_url,

content::Referrer(existing_tab->GetURL(),

blink::WebReferrerPolicyDefault),

- disposition, content::PAGE_TRANSITION_LINK, false));

+ disposition, ui::PAGE_TRANSITION_LINK, false));

// Reset existing_tab as OpenURL() may have clobbered it.

existing_tab = browser->tab_strip_model()->GetActiveWebContents();

if (params.tabstrip_add_types & TabStripModel::ADD_PINNED) {