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

Unified Diff: chrome/browser/prefs/incognito_mode_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
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/previews/previews_infobar_tab_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/incognito_mode_prefs.cc
diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc
index 1b021d65d0de4578a821c60a00ef8a5e02e19a81..b69acbbf45e0298429e629907efdfd1325e7af28 100644
--- a/chrome/browser/prefs/incognito_mode_prefs.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs.cc
@@ -15,7 +15,6 @@
#include "build/build_config.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/features.h"
#include "chrome/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
@@ -31,9 +30,9 @@
#include "base/win/windows_version.h"
#endif // OS_WIN
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
#include "chrome/browser/android/chrome_application.h"
-#endif // BUILDFLAG(ANDROID_JAVA_UI)
+#endif // defined(OS_ANDROID)
using content::BrowserThread;
@@ -209,7 +208,7 @@ void IncognitoModePrefs::InitializePlatformParentalControls() {
bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {
#if defined(OS_WIN)
return PlatformParentalControlsValue::GetInstance()->is_enabled();
-#elif BUILDFLAG(ANDROID_JAVA_UI)
+#elif defined(OS_ANDROID)
return chrome::android::ChromeApplication::AreParentalControlsEnabled();
#else
return false;
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/previews/previews_infobar_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698