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

Unified Diff: android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java

Issue 2815103004: Android: convert kEnumName to ENUM_NAME in java_cpp_enum.py. (Closed)
Patch Set: Address agrieve@ comments Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
index 27d2500daf8fe51645fcfe97a018509a16bd2c61..15ccdf2b191c936ab7903f577b78aeb7db05b938 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
@@ -1252,13 +1252,13 @@ class WebViewContentsClientAdapter extends AwContentsClient {
long result = 0;
for (String resource : resources) {
if (resource.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) {
- result |= Resource.VideoCapture;
+ result |= Resource.VIDEO_CAPTURE;
} else if (resource.equals(PermissionRequest.RESOURCE_AUDIO_CAPTURE)) {
- result |= Resource.AudioCapture;
+ result |= Resource.AUDIO_CAPTURE;
} else if (resource.equals(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID)) {
- result |= Resource.ProtectedMediaId;
+ result |= Resource.PROTECTED_MEDIA_ID;
} else if (resource.equals(AwPermissionRequest.RESOURCE_MIDI_SYSEX)) {
- result |= Resource.MIDISysex;
+ result |= Resource.MIDI_SYSEX;
}
}
return result;
@@ -1266,16 +1266,16 @@ class WebViewContentsClientAdapter extends AwContentsClient {
private static String[] toPermissionResources(long resources) {
ArrayList<String> result = new ArrayList<String>();
- if ((resources & Resource.VideoCapture) != 0) {
+ if ((resources & Resource.VIDEO_CAPTURE) != 0) {
result.add(PermissionRequest.RESOURCE_VIDEO_CAPTURE);
}
- if ((resources & Resource.AudioCapture) != 0) {
+ if ((resources & Resource.AUDIO_CAPTURE) != 0) {
result.add(PermissionRequest.RESOURCE_AUDIO_CAPTURE);
}
- if ((resources & Resource.ProtectedMediaId) != 0) {
+ if ((resources & Resource.PROTECTED_MEDIA_ID) != 0) {
result.add(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID);
}
- if ((resources & Resource.MIDISysex) != 0) {
+ if ((resources & Resource.MIDI_SYSEX) != 0) {
result.add(AwPermissionRequest.RESOURCE_MIDI_SYSEX);
}
String[] resource_array = new String[result.size()];
« no previous file with comments | « no previous file | android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698