chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java - Issue 136693011: Disable incognito if parental controls are enabled on android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java

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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « build/apk_test.gypi ('k') | chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java

index 2cc9b8667fe5e256241e8eb08abfb7d0ebe9a714..d8a594bbf805b4ba6819cd4a8801371cf1867724 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java

@@ -23,4 +23,11 @@ public abstract class ChromiumApplication extends ContentApplication {

@CalledByNative

protected abstract void showTermsOfServiceDialog();

+ /**

+ * @return Whether parental controls are enabled. Returning true will disable

+ * incognito mode.

+ */

+ @CalledByNative

+ protected abstract boolean areParentalControlsEnabled();

}