chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java - Issue 2768023002: Move remaining @CalledByNative methods out of ChromeApplication.

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/partnercustomizations/PartnerBrowserCustomizations.java

Issue 2768023002: Move remaining @CalledByNative methods out of ChromeApplication. (Closed)

Patch Set: Created 3 years, 9 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 | « chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java » ('j') | chrome/browser/android/chrome_application.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java

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

index 07ec7e799d5bded181a4e1b9539a3a6897d70faf..61288486a35b9e708156b869f2c028142680086e 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java

@@ -17,6 +17,7 @@ import android.util.Log;

import org.chromium.base.CommandLine;

import org.chromium.base.ThreadUtils;

import org.chromium.base.VisibleForTesting;

+import org.chromium.base.annotations.CalledByNative;

import org.chromium.chrome.browser.ChromeSwitches;

import org.chromium.chrome.browser.UrlConstants;

import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader;

@@ -61,6 +62,11 @@ public class PartnerBrowserCustomizations {

return sIncognitoModeDisabled;

}

+ @CalledByNative

+ private static boolean areParentalControlsEnabled() {

+ return isIncognitoDisabled();

+ }

/**

* @return Whether partner bookmarks editing is disabled by the partner.