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

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

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/ui/browser_navigator_params.h ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_navigator_params.cc
diff --git a/chrome/browser/ui/browser_navigator_params.cc b/chrome/browser/ui/browser_navigator_params.cc
index 74e086cee2a206779c66e1422c0bdf04a912b0c8..43d4b6208b1b94848039bfdd01a3a9b2d4e69019 100644
--- a/chrome/browser/ui/browser_navigator_params.cc
+++ b/chrome/browser/ui/browser_navigator_params.cc
@@ -8,7 +8,7 @@
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/page_navigator.h"
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/host_desktop.h"
#endif
@@ -19,7 +19,7 @@ using content::WebContents;
namespace chrome {
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
namespace {
HostDesktopType GetHostDesktop(Browser* browser) {
@@ -52,7 +52,9 @@ NavigateParams::NavigateParams(WebContents* a_target_contents)
should_replace_current_entry(false),
created_with_opener(false) {
}
-#else
+#endif // defined(OS_ANDROID)
+
+#if !defined(OS_ANDROID) || defined(USE_AURA)
NavigateParams::NavigateParams(Browser* a_browser,
const GURL& a_url,
ui::PageTransition a_transition)
@@ -100,7 +102,7 @@ NavigateParams::NavigateParams(Browser* a_browser,
should_replace_current_entry(false),
created_with_opener(false) {
}
-#endif // !defined(OS_ANDROID)
+#endif // !defined(OS_ANDROID) || defined(USE_AURA)
NavigateParams::NavigateParams(Profile* a_profile,
const GURL& a_url,
@@ -120,7 +122,7 @@ NavigateParams::NavigateParams(Profile* a_profile,
user_gesture(true),
path_behavior(RESPECT),
ref_behavior(IGNORE_REF),
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
browser(NULL),
#endif
initiating_profile(a_profile),
« no previous file with comments | « chrome/browser/ui/browser_navigator_params.h ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698