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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Rebase to master Created 3 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
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 55f8295a6015bf3f915e47b241e0f800427d0bee..9776ee1cf2957a53a1529b013dc804fabedf9a22 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -154,26 +154,22 @@
#include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
#endif
-#if BUILDFLAG(ANDROID_JAVA_UI)
-#include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
-#include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
-#include "components/ntp_tiles/popular_sites_impl.h"
-#else
-#include "chrome/browser/ui/startup/startup_browser_creator.h"
-#include "chrome/browser/upgrade_detector.h"
-#endif
-
#if defined(OS_ANDROID)
+#include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
#include "chrome/browser/android/ntp/content_suggestions_notifier_service.h"
+#include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
#include "chrome/browser/android/preferences/browser_prefs_android.h"
#include "chrome/browser/ntp_snippets/download_suggestions_provider.h"
#include "components/ntp_snippets/category_rankers/click_based_category_ranker.h"
#include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.h"
#include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestions_provider.h"
+#include "components/ntp_tiles/popular_sites_impl.h"
#else
#include "chrome/browser/services/gcm/gcm_product_util.h"
#include "chrome/browser/signin/signin_promo.h"
+#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "chrome/browser/ui/webui/foreign_session_handler.h"
+#include "chrome/browser/upgrade_detector.h"
#endif
#if defined(OS_CHROMEOS)
@@ -567,7 +563,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
SupervisedUserWhitelistService::RegisterProfilePrefs(registry);
#endif
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
ntp_tiles::PopularSitesImpl::RegisterProfilePrefs(registry);
variations::VariationsService::RegisterProfilePrefs(registry);
PartnerBookmarksShim::RegisterProfilePrefs(registry);
« no previous file with comments | « chrome/browser/policy/configuration_policy_handler_list_factory.cc ('k') | chrome/browser/prefs/incognito_mode_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698