OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_ | 5 #ifndef COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_H_ |
6 #define COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_ | 6 #define COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_H_ |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 | 9 |
10 namespace cronet { | 10 namespace cronet { |
11 | 11 |
12 // Define request priority values like REQUEST_PRIORITY_IDLE in a | 12 // Define request priority values like CRONET_REQUEST_PRIORITY_IDLE in a |
13 // way that ensures they're always the same than their Java counterpart. | 13 // way that ensures they're always the same than their Java counterpart. |
14 enum UrlRequestPriority { | 14 enum CronetUrlRequestPriority { |
mmenke
2014/10/20 21:07:29
As a reminder, there's a new way to do this.
mef
2014/10/21 14:49:11
Done.
| |
15 #define DEFINE_REQUEST_PRIORITY(x, y) REQUEST_PRIORITY_##x = y, | 15 #define DEFINE_REQUEST_PRIORITY(x, y) CRONET_REQUEST_PRIORITY_##x = y, |
16 #include "components/cronet/android/chromium_url_request_priority_list.h" | 16 #include "components/cronet/android/chromium_url_request_priority_list.h" |
17 #undef DEFINE_REQUEST_PRIORITY | 17 #undef DEFINE_REQUEST_PRIORITY |
18 }; | 18 }; |
19 | 19 |
20 // Define request priority values like REQUEST_ERROR_SUCCESS in a | 20 // Define request priority values like CRONET_REQUEST_ERROR_SUCCESS in a |
21 // way that ensures they're always the same than their Java counterpart. | 21 // way that ensures they're always the same than their Java counterpart. |
22 enum UrlRequestError { | 22 enum CronetUrlRequestError { |
23 #define DEFINE_REQUEST_ERROR(x, y) REQUEST_ERROR_##x = y, | 23 #define DEFINE_REQUEST_ERROR(x, y) CRONET_REQUEST_ERROR_##x = y, |
24 #include "components/cronet/android/chromium_url_request_error_list.h" | 24 #include "components/cronet/android/chromium_url_request_error_list.h" |
25 #undef DEFINE_REQUEST_ERROR | 25 #undef DEFINE_REQUEST_ERROR |
26 }; | 26 }; |
27 | 27 |
28 bool ChromiumUrlRequestRegisterJni(JNIEnv* env); | 28 bool CronetUrlRequestRegisterJni(JNIEnv* env); |
29 | 29 |
30 } // namespace cronet | 30 } // namespace cronet |
31 | 31 |
32 #endif // COMPONENTS_CRONET_ANDROID_CHROMIUM_URL_REQUEST_H_ | 32 #endif // COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_H_ |
OLD | NEW |