diff options
| author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 00:18:11 +0000 |
|---|---|---|
| committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 00:18:11 +0000 |
| commit | 1e4fdc0ba8d4438bda54a986be156f3d00081f4f (patch) | |
| tree | 944a13956d01fabb4fbaac27cb230df0315eb116 /chrome/browser/android/chromium_application.cc | |
| parent | 9983928d0c2d6a43ce5c40d3cb8d9eb6773b7d01 (diff) | |
| download | chromium_src-1e4fdc0ba8d4438bda54a986be156f3d00081f4f.zip chromium_src-1e4fdc0ba8d4438bda54a986be156f3d00081f4f.tar.gz chromium_src-1e4fdc0ba8d4438bda54a986be156f3d00081f4f.tar.bz2 | |
Disable incognito if parental controls are enabled on android.
Provides a hook to the Android application to specify whether parental
controls are enabled and incognito should be disabled.
TEST=build/android/test_runner.py gtest -s unit_tests
BUG=329276
Review URL: https://codereview.chromium.org/136693011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/android/chromium_application.cc')
| -rw-r--r-- | chrome/browser/android/chromium_application.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/android/chromium_application.cc b/chrome/browser/android/chromium_application.cc index 270a3f1..ff77aa5 100644 --- a/chrome/browser/android/chromium_application.cc +++ b/chrome/browser/android/chromium_application.cc @@ -33,5 +33,11 @@ void ChromiumApplication::ShowTermsOfServiceDialog() { base::android::GetApplicationContext()); } +bool ChromiumApplication::AreParentalControlsEnabled() { + return Java_ChromiumApplication_areParentalControlsEnabled( + base::android::AttachCurrentThread(), + base::android::GetApplicationContext()); +} + } // namespace android } // namespace chrome |