Upstrem prefs changes

chrome/browser/prefs/incognito_mode_prefs.cc

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 e3d7499e7052e80ee94e519dae39bae31ad3a2fc..91e71e620d073aca4b3ecac257d0c0fdc5b0c708 100644
--- a/chrome/browser/prefs/incognito_mode_prefs.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs.cc
@@ -209,7 +209,16 @@ bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {
 #if defined(OS_WIN)
   return PlatformParentalControlsValue::GetInstance()->is_enabled();
 #elif defined(OS_ANDROID)
+#if defined(USE_AURA)
+  // TODO(bshe): Support parental controls for Aura Android. See
+  // crbug.com/564742
+  NOTIMPLEMENTED();
+  return false;
+#else
   return chrome::android::ChromeApplication::AreParentalControlsEnabled();
+#endif
+#elif defined(OS_ANDROID) && defined(USE_AURA)
+

[battre, 2015/12/04 10:55:34]

the previous branch is less specific (USE_AURA) than this one (OS_ANDROID &&
USE_AURA). It will never be triggered.

[bshe, 2015/12/04 14:56:55]

deleted. I was using elif instead of nested ifdef in the "elif
defined(OS_ANDROID)". But later decide to use nested ifdef as the code is only a
few lines and still readable. This elif was a left over from my last attempt and
should be removed. sorry.

 #else
   return false;
 #endif