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

Unified Diff: chrome/browser/policy/configuration_policy_handler_list_factory.cc

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: 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/policy/configuration_policy_handler_list_factory.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index c028993d07a2535feda5e5c495821126f2d00027..c80d2d54db86ea6d5518333572c0fc1d3871a70e 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -58,7 +58,7 @@
#include "media/media_features.h"
#include "ppapi/features/features.h"
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
#include "chrome/browser/search/contextual_search_policy_handler_android.h"
#endif
@@ -554,14 +554,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
base::Value::Type::BOOLEAN },
#endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
{ key::kDataCompressionProxyEnabled,
prefs::kDataSaverEnabled,
base::Value::Type::BOOLEAN },
{ key::kAuthAndroidNegotiateAccountType,
prefs::kAuthAndroidNegotiateAccountType,
base::Value::Type::STRING },
-#endif // BUILDFLAG(ANDROID_JAVA_UI)
+#endif // defined(OS_ANDROID)
#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
{ key::kNativeMessagingUserLevelHosts,
@@ -816,7 +816,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
SCHEMA_STRICT, SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
handlers->AddHandler(
base::MakeUnique<ContextualSearchPolicyHandlerAndroid>());
#endif

Powered by Google App Engine
This is Rietveld 408576698