Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Unified Diff: chrome/browser/ui/browser_navigator_params.h

Issue 1419103010: Aura on Android: Compile extensions gn target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@compile_extensions_browser
Patch Set: Addressed feedback from patchset 9. Created 5 years, 1 month 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/extensions/component_loader.cc ('k') | chrome/browser/ui/browser_navigator_params.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d011c0eb986de499fd4bbafe4abd69549d91e2f7..cfc8104bd068e88cb7dcbbd2b08df417dd265daf 100644
--- a/chrome/browser/ui/browser_navigator_params.h
+++ b/chrome/browser/ui/browser_navigator_params.h
@@ -55,7 +55,8 @@ namespace chrome {
struct NavigateParams {
#if defined(OS_ANDROID)
explicit NavigateParams(content::WebContents* a_target_contents);
-#else
+#endif
+#if !defined(OS_ANDROID) || defined(USE_AURA)
NavigateParams(Browser* browser,
const GURL& a_url,
ui::PageTransition a_transition);
@@ -205,7 +206,7 @@ struct NavigateParams {
// Default is IGNORE.
RefBehavior ref_behavior;
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
// [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/extensions/component_loader.cc ('k') | chrome/browser/ui/browser_navigator_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698