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

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

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/prefs/browser_prefs.cc ('k') | chrome/browser/printing/print_job_worker.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 19ebf22c034634f62a21843b489c3487e11e0e1c..543451d4cf2f972e86a0decef7c468debcf5e27e 100644
--- a/chrome/browser/prefs/incognito_mode_prefs.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs.cc
@@ -12,6 +12,7 @@
#include "base/time/time.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 "content/public/browser/browser_thread.h"
@@ -26,9 +27,9 @@
#include "base/win/windows_version.h"
#endif // OS_WIN
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ANDROID_JAVA_UI)
#include "chrome/browser/android/chrome_application.h"
-#endif // OS_ANDROID
+#endif // BUILDFLAG(ANDROID_JAVA_UI)
using content::BrowserThread;
@@ -208,15 +209,13 @@ void IncognitoModePrefs::InitializePlatformParentalControls() {
bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {
#if defined(OS_WIN)
return PlatformParentalControlsValue::GetInstance()->is_enabled();
-#elif defined(OS_ANDROID)
-#if defined(USE_AURA)
+#elif defined(OS_ANDROID) && defined(USE_AURA)
// TODO(bshe): Support parental controls for Aura Android. See
// crbug.com/564742
NOTIMPLEMENTED();
return false;
-#else
+#elif BUILDFLAG(ANDROID_JAVA_UI)
return chrome::android::ChromeApplication::AreParentalControlsEnabled();
-#endif
#else
return false;
#endif
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/printing/print_job_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698