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

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

Issue 1054203002: Enable NeedsBraces check and fix some checkstyle issues. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added if checks Created 5 years, 9 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
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 ff9b07029f4ca8081e1c484fea5dea1fbcd0806c..6fb65e91ca97006181b298ccda1c5afe2a45b79c 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
@@ -1195,24 +1195,28 @@ public class WebViewContentsClientAdapter extends AwContentsClient {
public static long toAwPermissionResources(String[] resources) {
long result = 0;
for (String resource : resources) {
- if (resource.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE))
+ if (resource.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) {
result |= BITMASK_RESOURCE_VIDEO_CAPTURE;
- else if (resource.equals(PermissionRequest.RESOURCE_AUDIO_CAPTURE))
+ } else if (resource.equals(PermissionRequest.RESOURCE_AUDIO_CAPTURE)) {
result |= BITMASK_RESOURCE_AUDIO_CAPTURE;
- else if (resource.equals(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID))
+ } else if (resource.equals(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID)) {
result |= BITMASK_RESOURCE_PROTECTED_MEDIA_ID;
+ }
}
return result;
}
private static String[] toPermissionResources(long resources) {
ArrayList<String> result = new ArrayList<String>();
- if ((resources & BITMASK_RESOURCE_VIDEO_CAPTURE) != 0)
+ if ((resources & BITMASK_RESOURCE_VIDEO_CAPTURE) != 0) {
result.add(PermissionRequest.RESOURCE_VIDEO_CAPTURE);
- if ((resources & BITMASK_RESOURCE_AUDIO_CAPTURE) != 0)
+ }
+ if ((resources & BITMASK_RESOURCE_AUDIO_CAPTURE) != 0) {
result.add(PermissionRequest.RESOURCE_AUDIO_CAPTURE);
- if ((resources & BITMASK_RESOURCE_PROTECTED_MEDIA_ID) != 0)
+ }
+ if ((resources & BITMASK_RESOURCE_PROTECTED_MEDIA_ID) != 0) {
result.add(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID);
+ }
String[] resource_array = new String[result.size()];
return result.toArray(resource_array);
}
@@ -1244,10 +1248,11 @@ public class WebViewContentsClientAdapter extends AwContentsClient {
@Override
public void grant(String[] resources) {
long requestedResource = mAwPermissionRequest.getResources();
- if ((requestedResource & toAwPermissionResources(resources)) == requestedResource)
+ if ((requestedResource & toAwPermissionResources(resources)) == requestedResource) {
mAwPermissionRequest.grant();
- else
+ } else {
mAwPermissionRequest.deny();
+ }
}
@Override

Powered by Google App Engine
This is Rietveld 408576698