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

Unified Diff: chrome/browser/history/chrome_history_backend_client.cc

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: chrome/browser/history/chrome_history_backend_client.cc
diff --git a/chrome/browser/history/chrome_history_backend_client.cc b/chrome/browser/history/chrome_history_backend_client.cc
index 1d0e841c315f2015a73b917bff1ba169bdb90b1b..d847bfbd4c41f0190bdedaf27ab92a4c57c01998 100644
--- a/chrome/browser/history/chrome_history_backend_client.cc
+++ b/chrome/browser/history/chrome_history_backend_client.cc
@@ -9,14 +9,14 @@
#include "components/version_info/version_info.h"
#include "url/gurl.h"
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
#include "base/files/file_path.h"
#include "base/logging.h"
#include "chrome/browser/history/android/android_provider_backend.h"
#include "components/history/core/browser/history_backend.h"
#endif
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
namespace {
const base::FilePath::CharType kAndroidCacheFilename[] =
FILE_PATH_LITERAL("AndroidCache");
@@ -70,7 +70,7 @@ bool ChromeHistoryBackendClient::ShouldReportDatabaseError() {
channel != version_info::Channel::BETA;
}
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
void ChromeHistoryBackendClient::OnHistoryBackendInitialized(
history::HistoryBackend* history_backend,
history::HistoryDatabase* history_database,
@@ -91,4 +91,4 @@ void ChromeHistoryBackendClient::OnHistoryBackendDestroyed(
const base::FilePath& history_dir) {
sql::Connection::Delete(history_dir.Append(kAndroidCacheFilename));
}
-#endif // defined(OS_ANDROID)
+#endif // defined(ANDROID_JAVA_UI)

Powered by Google App Engine
This is Rietveld 408576698