Upstrem prefs changes

chrome/browser/prefs/incognito_mode_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
@@ skipping 191 matching lines @@
       base::Bind(
           base::IgnoreResult(&PlatformParentalControlsValue::GetInstance)));
 }
 #endif
 
 // static
 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
 }