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

Side by Side Diff: chrome/browser/android/chromium_application.cc

Issue 136693011: Disable incognito if parental controls are enabled on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Keep native_test as the package to be compliant w/ testing framework Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/chromium_application.h" 5 #include "chrome/browser/android/chromium_application.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "jni/ChromiumApplication_jni.h" 8 #include "jni/ChromiumApplication_jni.h"
9 9
10 namespace chrome { 10 namespace chrome {
(...skipping 15 matching lines...) Expand all
26 base::android::AttachCurrentThread(), 26 base::android::AttachCurrentThread(),
27 base::android::GetApplicationContext()); 27 base::android::GetApplicationContext());
28 } 28 }
29 29
30 void ChromiumApplication::ShowTermsOfServiceDialog() { 30 void ChromiumApplication::ShowTermsOfServiceDialog() {
31 Java_ChromiumApplication_showTermsOfServiceDialog( 31 Java_ChromiumApplication_showTermsOfServiceDialog(
32 base::android::AttachCurrentThread(), 32 base::android::AttachCurrentThread(),
33 base::android::GetApplicationContext()); 33 base::android::GetApplicationContext());
34 } 34 }
35 35
36 bool ChromiumApplication::AreParentalControlsEnabled() {
37 return Java_ChromiumApplication_areParentalControlsEnabled(
38 base::android::AttachCurrentThread(),
39 base::android::GetApplicationContext());
40 }
41
36 } // namespace android 42 } // namespace android
37 } // namespace chrome 43 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/android/chromium_application.h ('k') | chrome/browser/prefs/incognito_mode_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698