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

Side by Side Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc

Issue 2922663002: Data Reduction Proxy: Remove duplicate functions (Closed)
Patch Set: megjablon comments Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 : weak_factory_(this) { 59 : weak_factory_(this) {
60 j_settings_obj_ = JavaObjectWeakGlobalRef(env, obj); 60 j_settings_obj_ = JavaObjectWeakGlobalRef(env, obj);
61 } 61 }
62 62
63 DataReductionProxySettingsAndroid::~DataReductionProxySettingsAndroid() { 63 DataReductionProxySettingsAndroid::~DataReductionProxySettingsAndroid() {
64 } 64 }
65 65
66 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyPromoAllowed( 66 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyPromoAllowed(
67 JNIEnv* env, 67 JNIEnv* env,
68 const JavaParamRef<jobject>& obj) { 68 const JavaParamRef<jobject>& obj) {
69 return Settings()->PromoAllowed(); 69 return data_reduction_proxy::params::IsIncludedInPromoFieldTrial();
70 } 70 }
71 71
72 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled( 72 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled(
73 JNIEnv* env, 73 JNIEnv* env,
74 const JavaParamRef<jobject>& obj) { 74 const JavaParamRef<jobject>& obj) {
75 return Settings()->IsDataReductionProxyEnabled(); 75 return Settings()->IsDataReductionProxyEnabled();
76 } 76 }
77 77
78 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyManaged( 78 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyManaged(
79 JNIEnv* env, 79 JNIEnv* env,
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 env, j_settings_obj_.get(env), j_query_result_obj_.obj()); 261 env, j_settings_obj_.get(env), j_query_result_obj_.obj());
262 262
263 j_query_result_obj_.Release(); 263 j_query_result_obj_.Release();
264 } 264 }
265 265
266 // Used by generated jni code. 266 // Used by generated jni code.
267 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { 267 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
268 return reinterpret_cast<intptr_t>( 268 return reinterpret_cast<intptr_t>(
269 new DataReductionProxySettingsAndroid(env, obj)); 269 new DataReductionProxySettingsAndroid(env, obj));
270 } 270 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698