| OLD | NEW |
| 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 "base/android/build_info.h" | 7 #include "base/android/build_info.h" |
| 8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 " } " | 284 " } " |
| 285 " if (url.substring(0, 5) == 'http:') {" | 285 " if (url.substring(0, 5) == 'http:') {" |
| 286 " return '" + proxy_host + fallback_host + "DIRECT';" | 286 " return '" + proxy_host + fallback_host + "DIRECT';" |
| 287 " }" | 287 " }" |
| 288 " return 'DIRECT';" | 288 " return 'DIRECT';" |
| 289 "}"; | 289 "}"; |
| 290 return pac; | 290 return pac; |
| 291 } | 291 } |
| 292 | 292 |
| 293 // Used by generated jni code. | 293 // Used by generated jni code. |
| 294 static jint Init(JNIEnv* env, jobject obj) { | 294 static jlong Init(JNIEnv* env, jobject obj) { |
| 295 DataReductionProxySettingsAndroid* settings = | 295 DataReductionProxySettingsAndroid* settings = |
| 296 new DataReductionProxySettingsAndroid(env, obj); | 296 new DataReductionProxySettingsAndroid(env, obj); |
| 297 return reinterpret_cast<jint>(settings); | 297 return reinterpret_cast<intptr_t>(settings); |
| 298 } | 298 } |
| OLD | NEW |