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

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

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
« no previous file with comments | « chrome/browser/ui/browser_navigator_params.h ('k') | chrome/browser/ui/views/frame/browser_frame_android.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 8bde2459edcc26b7d7c2374022573f7d64de5e9d..1319a0f0f3cdfff005fe7d3e1d5e1195bf7f466b 100644
--- a/chrome/browser/ui/browser_navigator_params.cc
+++ b/chrome/browser/ui/browser_navigator_params.cc
@@ -9,7 +9,7 @@
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/page_navigator.h"
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/host_desktop.h"
#endif
@@ -20,7 +20,7 @@ using content::WebContents;
namespace chrome {
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
namespace {
HostDesktopType GetHostDesktop(Browser* browser) {
@@ -53,9 +53,7 @@ NavigateParams::NavigateParams(WebContents* a_target_contents)
should_replace_current_entry(false),
created_with_opener(false) {
}
-#endif // defined(OS_ANDROID)
-
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#else
NavigateParams::NavigateParams(Browser* a_browser,
const GURL& a_url,
ui::PageTransition a_transition)
@@ -103,7 +101,7 @@ NavigateParams::NavigateParams(Browser* a_browser,
should_replace_current_entry(false),
created_with_opener(false) {
}
-#endif // !defined(OS_ANDROID) || defined(USE_AURA)
+#endif // !defined(OS_ANDROID)
NavigateParams::NavigateParams(Profile* a_profile,
const GURL& a_url,
@@ -123,7 +121,7 @@ NavigateParams::NavigateParams(Profile* a_profile,
user_gesture(true),
path_behavior(RESPECT),
ref_behavior(IGNORE_REF),
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
browser(NULL),
#endif
initiating_profile(a_profile),
« no previous file with comments | « chrome/browser/ui/browser_navigator_params.h ('k') | chrome/browser/ui/views/frame/browser_frame_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698