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

Unified Diff: chrome/browser/browsing_data/browsing_data_remover.h

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years 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/browser_process_impl.cc ('k') | chrome/browser/browsing_data/browsing_data_remover.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browsing_data/browsing_data_remover.h
diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
index 62cd36ea834b280e4c146644010b94a277ca5b0a..fd048508d0ecc56c6561566738fb2b079779d379 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.h
+++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -16,6 +16,7 @@
#include "base/task/cancelable_task_tracker.h"
#include "base/time/time.h"
#include "chrome/browser/pepper_flash_settings_manager.h"
+#include "chrome/common/features.h"
#include "components/search_engines/template_url_service.h"
#if defined(OS_CHROMEOS)
#include "chromeos/dbus/dbus_method_call_status.h"
@@ -83,7 +84,7 @@ class BrowsingDataRemover
REMOVE_NOCHECKS = 1 << 16,
REMOVE_WEBRTC_IDENTITY = 1 << 17,
REMOVE_CACHE_STORAGE = 1 << 18,
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ANDROID_JAVA_UI)
REMOVE_WEBAPP_DATA = 1 << 19,
REMOVE_OFFLINE_PAGE_DATA = 1 << 20,
#endif
@@ -104,7 +105,7 @@ class BrowsingDataRemover
REMOVE_WEBSQL |
REMOVE_CHANNEL_IDS |
REMOVE_SITE_USAGE_DATA |
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ANDROID_JAVA_UI)
REMOVE_WEBAPP_DATA |
REMOVE_OFFLINE_PAGE_DATA |
#endif
@@ -397,7 +398,7 @@ class BrowsingDataRemover
void OnClearedWebRtcLogs();
#endif
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ANDROID_JAVA_UI)
// Callback on UI thread when the precache history has been cleared.
void OnClearedPrecacheHistory();
@@ -465,7 +466,7 @@ class BrowsingDataRemover
bool waiting_for_clear_platform_keys_ = false;
bool waiting_for_clear_plugin_data_ = false;
bool waiting_for_clear_pnacl_cache_ = false;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ANDROID_JAVA_UI)
bool waiting_for_clear_precache_history_ = false;
bool waiting_for_clear_webapp_data_ = false;
bool waiting_for_clear_offline_page_data_ = false;
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/browsing_data/browsing_data_remover.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698