diff options
author | megjablon <megjablon@chromium.org> | 2015-05-20 11:16:45 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-20 18:16:59 +0000 |
commit | 2a43817963db104c1e23bfd38c1cdaeaf0ddcb1a (patch) | |
tree | 25899ffc308d8863f93824f31016eb9d23dbd552 | |
parent | 22ca12c760e23efdc988409149fd2d4e43e6fed9 (diff) | |
download | chromium_src-2a43817963db104c1e23bfd38c1cdaeaf0ddcb1a.zip chromium_src-2a43817963db104c1e23bfd38c1cdaeaf0ddcb1a.tar.gz chromium_src-2a43817963db104c1e23bfd38c1cdaeaf0ddcb1a.tar.bz2 |
JNI support for IsLoFiEnabled in DataReductionProxySettings.
BUG=484756
Review URL: https://codereview.chromium.org/1134303004
Cr-Commit-Position: refs/heads/master@{#330773}
4 files changed, 16 insertions, 3 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java index 929714c..d944658 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java @@ -142,6 +142,11 @@ public class DataReductionProxySettings { 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. */ public boolean isDataReductionProxyManaged() { return nativeIsDataReductionProxyManaged(mNativeDataReductionProxySettings); @@ -212,6 +217,8 @@ public class DataReductionProxySettings { long nativeDataReductionProxySettingsAndroid); private native boolean nativeIsDataReductionProxyEnabled( long nativeDataReductionProxySettingsAndroid); + private native boolean nativeIsLoFiEnabled( + long nativeDataReductionProxySettingsAndroid); private native boolean nativeIsDataReductionProxyManaged( long nativeDataReductionProxySettingsAndroid); private native void nativeSetDataReductionProxyEnabled( diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc index 284294b..dfe7b00 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc @@ -49,6 +49,11 @@ jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled( return Settings()->IsDataReductionProxyEnabled(); } +jboolean DataReductionProxySettingsAndroid::IsLoFiEnabled( + JNIEnv* env, jobject obj) { + return Settings()->IsLoFiEnabled(); +} + jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyManaged( JNIEnv* env, jobject obj) { return Settings()->IsDataReductionProxyManaged(); diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h index 1a00a78a..9293ac5 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h @@ -38,6 +38,7 @@ class DataReductionProxySettingsAndroid { jboolean IsDataReductionProxyPromoAllowed(JNIEnv* env, jobject obj); jboolean IsIncludedInAltFieldTrial(JNIEnv* env, jobject obj); jboolean IsDataReductionProxyEnabled(JNIEnv* env, jobject obj); + jboolean IsLoFiEnabled(JNIEnv* env, jobject obj); jboolean IsDataReductionProxyManaged(JNIEnv* env, jobject obj); void SetDataReductionProxyEnabled(JNIEnv* env, jobject obj, jboolean enabled); diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h index 213a248..d4c53de 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h @@ -99,6 +99,9 @@ class DataReductionProxySettings : public DataReductionProxyServiceObserver { // Enables or disables the alternative data reduction proxy configuration. 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 // daily original and received content lengths. int64 GetDataReductionLastUpdateTime(); @@ -205,9 +208,6 @@ class DataReductionProxySettings : public DataReductionProxyServiceObserver { // Override of DataReductionProxyService::Observer. void OnServiceInitialized() override; - // Returns true if both LoFi and the proxy are enabled. - bool IsLoFiEnabled() const; - // Registers the trial "SyntheticDataReductionProxySetting" with the group // "Enabled" or "Disabled". Indicates whether the proxy is turned on or not. void RegisterDataReductionProxyFieldTrial(); |