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

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

Issue 1556383002: Partially revert of Upstrem prefs changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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') | no next file » | 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 929263ae74625880ea853107c4a19882548273aa..3e2c062783880734d82b1851db1692f22dad14b1 100644
--- a/chrome/browser/prefs/incognito_mode_prefs.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs.cc
@@ -213,11 +213,6 @@ void IncognitoModePrefs::InitializePlatformParentalControls() {
bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {
#if defined(OS_WIN)
return PlatformParentalControlsValue::GetInstance()->is_enabled();
-#elif defined(OS_ANDROID) && defined(USE_AURA)
- // TODO(bshe): Support parental controls for Aura Android. See
- // crbug.com/564742
- NOTIMPLEMENTED();
- return false;
#elif BUILDFLAG(ANDROID_JAVA_UI)
return chrome::android::ChromeApplication::AreParentalControlsEnabled();
#else
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698