Disable incognito if parental controls are enabled on android.

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/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
-#endif  // OS_WIN
+#elif defined(OS_ANDROID)

[Bernhard Bauer, 2014/01/14 09:59:07]

Nit: I'd rather keep these #ifdefs separate (it reduces merge conflicts).

[Ted C, 2014/01/15 00:15:49]

Done.

+#include "chrome/browser/android/chromium_application.h"
+#endif
 
 // static
 bool IncognitoModePrefs::IntToAvailability(int in_value,
                                            Availability* out_value) {
   if (in_value < 0 || in_value >= AVAILABILITY_NUM_TYPES) {
     *out_value = ENABLED;
     return false;
   }
   *out_value = static_cast<Availability>(in_value);
   return true;
 }
 
 // static
 IncognitoModePrefs::Availability IncognitoModePrefs::GetAvailability(
     const PrefService* pref_service) {
   DCHECK(pref_service);
   int pref_value = pref_service->GetInteger(prefs::kIncognitoModeAvailability);
   Availability result = IncognitoModePrefs::ENABLED;
   bool valid = IntToAvailability(pref_value, &result);
   DCHECK(valid);
 #if defined(OS_WIN)
   // Disable incognito mode windows if parental controls are on. This is only
   // for Windows Vista and above.
   if (base::win::IsParentalControlActivityLoggingOn()) {

[Bernhard Bauer, 2014/01/14 09:59:07]

Hm, would it make sense to make this into a single method that returns whether
platform-specific parental controls are enabled, instead of adding one for every
platform?

[Ted C, 2014/01/14 20:22:59]

Thoughts on where such a thing should live?

Since we have the dependency on chrome, it couldn't live in base w/ the existing
metro.h.

I could create a define a function in incognito_mode_prefs.cc:
bool ArePlatformParentalControlsEnabled();

Then have incognito_mode_prefs_android.cc, incognito_mode_prefs_win[posix]
etc... that define the method and return the platform implementation.

Or are you thinking there is a more generic place?  I tried poking around and
nothing jumped out as a "platform feature" helper or anything.

[Bernhard Bauer, 2014/01/14 23:26:26]

Hmm... good question. We could probably add some hooks for a base/ embedder, to
get rid of the chrome dependency, but that seems a bit complicated. So does
moving the implementations to platform-specific files (if that's the only thing
in them).

I guess I'd be okay with pulling this out into a method like you suggested, and
then keeping it here for now, keeping in mind to move it to its own file if we
start adding more things like it. think in general organized things by feature
instead of by platform scales better.

[Ted C, 2014/01/15 00:15:49]

I split it out a separate function.

     if (result == IncognitoModePrefs::FORCED)
       LOG(ERROR) << "Ignoring FORCED incognito. Parental control logging on";
     return IncognitoModePrefs::DISABLED;
   }
+#elif defined(OS_ANDROID)
+  if (chrome::android::ChromiumApplication::AreParentalControlsEnabled())
+    return IncognitoModePrefs::DISABLED;
 #endif  // OS_WIN
   return result;
 }
 
 // static
 void IncognitoModePrefs::SetAvailability(PrefService* prefs,
                                          const Availability availability) {
   prefs->SetInteger(prefs::kIncognitoModeAvailability, availability);
 }
 
@@ skipping 24 matching lines @@
     case IncognitoModePrefs::DISABLED:
       return !profile->IsOffTheRecord();
     case IncognitoModePrefs::FORCED:
       return profile->IsOffTheRecord();
     case IncognitoModePrefs::AVAILABILITY_NUM_TYPES:
       NOTREACHED();
   }
   NOTREACHED();
   return false;
 }