Commit 2a438179 authored by megjablon's avatar megjablon Committed by Commit bot

JNI support for IsLoFiEnabled in DataReductionProxySettings.

BUG=484756

Review URL: https://codereview.chromium.org/1134303004

Cr-Commit-Position: refs/heads/master@{#330773}
parent 22ca12c7
...@@ -142,6 +142,11 @@ public class DataReductionProxySettings { ...@@ -142,6 +142,11 @@ public class DataReductionProxySettings {
return nativeIsDataReductionProxyEnabled(mNativeDataReductionProxySettings); return nativeIsDataReductionProxyEnabled(mNativeDataReductionProxySettings);
} }
/** Returns true if Data Reduction Proxy LoFi is enabled. */
public boolean isLoFiEnabled() {
return nativeIsLoFiEnabled(mNativeDataReductionProxySettings);
}
/** Returns true if the SPDY proxy is managed by an administrator's policy. */ /** Returns true if the SPDY proxy is managed by an administrator's policy. */
public boolean isDataReductionProxyManaged() { public boolean isDataReductionProxyManaged() {
return nativeIsDataReductionProxyManaged(mNativeDataReductionProxySettings); return nativeIsDataReductionProxyManaged(mNativeDataReductionProxySettings);
...@@ -212,6 +217,8 @@ public class DataReductionProxySettings { ...@@ -212,6 +217,8 @@ public class DataReductionProxySettings {
long nativeDataReductionProxySettingsAndroid); long nativeDataReductionProxySettingsAndroid);
private native boolean nativeIsDataReductionProxyEnabled( private native boolean nativeIsDataReductionProxyEnabled(
long nativeDataReductionProxySettingsAndroid); long nativeDataReductionProxySettingsAndroid);
private native boolean nativeIsLoFiEnabled(
long nativeDataReductionProxySettingsAndroid);
private native boolean nativeIsDataReductionProxyManaged( private native boolean nativeIsDataReductionProxyManaged(
long nativeDataReductionProxySettingsAndroid); long nativeDataReductionProxySettingsAndroid);
private native void nativeSetDataReductionProxyEnabled( private native void nativeSetDataReductionProxyEnabled(
......
...@@ -49,6 +49,11 @@ jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled( ...@@ -49,6 +49,11 @@ jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled(
return Settings()->IsDataReductionProxyEnabled(); return Settings()->IsDataReductionProxyEnabled();
} }
jboolean DataReductionProxySettingsAndroid::IsLoFiEnabled(
JNIEnv* env, jobject obj) {
return Settings()->IsLoFiEnabled();
}
jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyManaged( jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyManaged(
JNIEnv* env, jobject obj) { JNIEnv* env, jobject obj) {
return Settings()->IsDataReductionProxyManaged(); return Settings()->IsDataReductionProxyManaged();
......
...@@ -38,6 +38,7 @@ class DataReductionProxySettingsAndroid { ...@@ -38,6 +38,7 @@ class DataReductionProxySettingsAndroid {
jboolean IsDataReductionProxyPromoAllowed(JNIEnv* env, jobject obj); jboolean IsDataReductionProxyPromoAllowed(JNIEnv* env, jobject obj);
jboolean IsIncludedInAltFieldTrial(JNIEnv* env, jobject obj); jboolean IsIncludedInAltFieldTrial(JNIEnv* env, jobject obj);
jboolean IsDataReductionProxyEnabled(JNIEnv* env, jobject obj); jboolean IsDataReductionProxyEnabled(JNIEnv* env, jobject obj);
jboolean IsLoFiEnabled(JNIEnv* env, jobject obj);
jboolean IsDataReductionProxyManaged(JNIEnv* env, jobject obj); jboolean IsDataReductionProxyManaged(JNIEnv* env, jobject obj);
void SetDataReductionProxyEnabled(JNIEnv* env, jobject obj, jboolean enabled); void SetDataReductionProxyEnabled(JNIEnv* env, jobject obj, jboolean enabled);
......
...@@ -99,6 +99,9 @@ class DataReductionProxySettings : public DataReductionProxyServiceObserver { ...@@ -99,6 +99,9 @@ class DataReductionProxySettings : public DataReductionProxyServiceObserver {
// Enables or disables the alternative data reduction proxy configuration. // Enables or disables the alternative data reduction proxy configuration.
void SetDataReductionProxyAlternativeEnabled(bool enabled); void SetDataReductionProxyAlternativeEnabled(bool enabled);
// Returns true if both LoFi and the proxy are enabled.
bool IsLoFiEnabled() const;
// Returns the time in microseconds that the last update was made to the // Returns the time in microseconds that the last update was made to the
// daily original and received content lengths. // daily original and received content lengths.
int64 GetDataReductionLastUpdateTime(); int64 GetDataReductionLastUpdateTime();
...@@ -205,9 +208,6 @@ class DataReductionProxySettings : public DataReductionProxyServiceObserver { ...@@ -205,9 +208,6 @@ class DataReductionProxySettings : public DataReductionProxyServiceObserver {
// Override of DataReductionProxyService::Observer. // Override of DataReductionProxyService::Observer.
void OnServiceInitialized() override; void OnServiceInitialized() override;
// Returns true if both LoFi and the proxy are enabled.
bool IsLoFiEnabled() const;
// Registers the trial "SyntheticDataReductionProxySetting" with the group // Registers the trial "SyntheticDataReductionProxySetting" with the group
// "Enabled" or "Disabled". Indicates whether the proxy is turned on or not. // "Enabled" or "Disabled". Indicates whether the proxy is turned on or not.
void RegisterDataReductionProxyFieldTrial(); void RegisterDataReductionProxyFieldTrial();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment