chrome/browser/ui/browser_navigator_params.h - Issue 1560503002: Removing the code added to make chrome compile on Aura Android.

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/browser_navigator_params.h

Issue 1560503002: Removing the code added to make chrome compile on Aura Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo delete of aura_android.gni - will delete in a separate CL. Created 4 years, 11 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

Index: chrome/browser/ui/browser_navigator_params.h

diff --git a/chrome/browser/ui/browser_navigator_params.h b/chrome/browser/ui/browser_navigator_params.h

index 4374bcdda22b8b2cc8403ad26b43b7f099ebd1c6..9e3382234bf0e5e5f4c9e9c08fe6a18f5d1a9a00 100644

--- a/chrome/browser/ui/browser_navigator_params.h

+++ b/chrome/browser/ui/browser_navigator_params.h

@@ -56,8 +56,7 @@ namespace chrome {

struct NavigateParams {

#if defined(OS_ANDROID)

explicit NavigateParams(content::WebContents* a_target_contents);

-#endif

-#if !defined(OS_ANDROID) || defined(USE_AURA)

+#else

NavigateParams(Browser* browser,

const GURL& a_url,

ui::PageTransition a_transition);

@@ -207,7 +206,7 @@ struct NavigateParams {

// Default is IGNORE.

RefBehavior ref_behavior;

-#if !defined(OS_ANDROID) || defined(USE_AURA)

+#if !defined(OS_ANDROID)

// [in] Specifies a Browser object where the navigation could occur or the

// tab could be added. Navigate() is not obliged to use this Browser if

// it is not compatible with the operation being performed. This can be

« no previous file with comments | « chrome/browser/media_galleries/media_folder_finder.cc ('k') | chrome/browser/ui/browser_navigator_params.cc » ('j') | no next file with comments »