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

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

Issue 1220683008: Move AppRestriction to Policy code out of //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 5 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 | « no previous file | chrome/browser/android/chrome_jni_registrar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyManager.java b/chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyManager.java
index 9856dba21407b9e677c736a33b7ae854ef4fa472..d4f1e20f13bbdf189e0e692530ef6d59fe3c13cf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/policy/PolicyManager.java
@@ -8,6 +8,7 @@
import org.chromium.base.CalledByNative;
import org.chromium.base.ThreadUtils;
+import org.chromium.policy.PolicyConverter;
import java.util.ArrayList;
import java.util.List;
@@ -19,6 +20,7 @@
public class PolicyManager {
private long mNativePolicyManager;
+ private PolicyConverter mPolicyConverter;
private final List<PolicyProvider> mPolicyProviders = new ArrayList<>();
private final List<Bundle> mCachedPolicies = new ArrayList<>();
private final List<PolicyChangeListener> mPolicyChangeListeners = new ArrayList<>();
@@ -26,6 +28,7 @@
public void initializeNative() {
ThreadUtils.assertOnUiThread();
mNativePolicyManager = nativeInit();
+ mPolicyConverter = nativeCreatePolicyConverter(mNativePolicyManager);
}
/**
@@ -51,6 +54,7 @@ public void destroy() {
nativeDestroy(mNativePolicyManager);
mNativePolicyManager = 0;
+ mPolicyConverter = null;
}
void onSettingsAvailable(int source, Bundle newSettings) {
@@ -61,24 +65,7 @@ void onSettingsAvailable(int source, Bundle newSettings) {
}
for (Bundle settings : mCachedPolicies) {
for (String key : settings.keySet()) {
- Object value = settings.get(key);
- if (value instanceof Boolean) {
- nativeSetPolicyBoolean(mNativePolicyManager, key, (Boolean) value);
- continue;
- }
- if (value instanceof String) {
- nativeSetPolicyString(mNativePolicyManager, key, (String) value);
- continue;
- }
- if (value instanceof Integer) {
- nativeSetPolicyInteger(mNativePolicyManager, key, (Integer) value);
- continue;
- }
- if (value instanceof String[]) {
- nativeSetPolicyStringArray(mNativePolicyManager, key, (String[]) value);
- continue;
- }
- assert false : "Invalid setting " + value + " for key " + key;
+ mPolicyConverter.setPolicy(key, settings.get(key));
}
}
nativeFlushPolicies(mNativePolicyManager);
@@ -121,15 +108,7 @@ private void refreshPolicies() {
}
private native long nativeInit();
+ private native PolicyConverter nativeCreatePolicyConverter(long nativePolicyManager);
private native void nativeDestroy(long nativePolicyManager);
-
- private native void nativeSetPolicyBoolean(
- long nativePolicyManager, String policyKey, boolean value);
- private native void nativeSetPolicyInteger(
- long nativePolicyManager, String policyKey, int value);
- private native void nativeSetPolicyString(
- long nativePolicyManager, String policyKey, String value);
- private native void nativeSetPolicyStringArray(
- long nativePolicyManager, String policyKey, String[] value);
private native void nativeFlushPolicies(long nativePolicyManager);
}
« no previous file with comments | « no previous file | chrome/browser/android/chrome_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698