diff options
42 files changed, 133 insertions, 133 deletions
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/ResourcesContextWrapperFactory.java b/android_webview/glue/java/src/com/android/webview/chromium/ResourcesContextWrapperFactory.java index e33188f..a6e58a3 100644 --- a/android_webview/glue/java/src/com/android/webview/chromium/ResourcesContextWrapperFactory.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/ResourcesContextWrapperFactory.java @@ -74,8 +74,9 @@ public class ResourcesContextWrapperFactory { @Override public Context getApplicationContext() { - if (mApplicationContext == null) + if (mApplicationContext == null) { mApplicationContext = get(ctx.getApplicationContext()); + } return mApplicationContext; } 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 ff9b070..6fb65e9 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 diff --git a/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java b/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java index 09c9440..1657a96 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java +++ b/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java @@ -64,8 +64,7 @@ public class AwAutofillClient { @CalledByNative public void hideAutofillPopup() { - if (mAutofillPopup == null) - return; + if (mAutofillPopup == null) return; mAutofillPopup.dismiss(); mAutofillPopup = null; } diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index f3273ac..3079e33 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -766,11 +766,12 @@ public class AwContents implements SmartClipProvider, * in the WebView. */ void exitFullScreen() { - if (!isFullScreen() || isDestroyed()) + if (!isFullScreen() || isDestroyed()) { // exitFullScreen() can be called without a prior call to enterFullScreen() if a // "misbehave" app overrides onShowCustomView but does not add the custom view to // the window. Exiting avoids a crash. return; + } // Detach to tear down the GL functor if this is still associated with the old // container view. It will be recreated during the next call to onDraw attached to @@ -2605,6 +2606,7 @@ public class AwContents implements SmartClipProvider, return; } mContentViewCore.setSmartClipDataListener(new ContentViewCore.SmartClipDataListener() { + @Override public void onSmartClipDataExtracted(String text, String html, Rect clipRect) { Bundle bundle = new Bundle(); bundle.putString("url", mContentViewCore.getWebContents().getVisibleUrl()); diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java index acd1e9d..e56d7d5 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java @@ -215,8 +215,9 @@ public abstract class AwContentsClient { // TODO: Move this code to Aw. Once code is moved // and merged to M37 get rid of this. String mimeType = "*/*"; - if (mAcceptTypes != null && !mAcceptTypes.trim().isEmpty()) + if (mAcceptTypes != null && !mAcceptTypes.trim().isEmpty()) { mimeType = mAcceptTypes.split(";")[0]; + } Intent i = new Intent(Intent.ACTION_GET_CONTENT); i.addCategory(Intent.CATEGORY_OPENABLE); diff --git a/android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java b/android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java index 11c166d5..9ed9a14 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java +++ b/android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java @@ -241,8 +241,7 @@ public class AwScrollOffsetManager { return; } - if (x == mNativeScrollX && y == mNativeScrollY) - return; + if (x == mNativeScrollX && y == mNativeScrollY) return; // The scrollNativeTo call should be a simple store, so it's OK to assume it always // succeeds. @@ -322,8 +321,7 @@ public class AwScrollOffsetManager { int dx = x - scrollX; int dy = y - scrollY; - if (dx == 0 && dy == 0) - return false; + if (dx == 0 && dy == 0) return false; mScroller.startScroll(scrollX, scrollY, dx, dy, computeDurationInMilliSec(dx, dy)); mDelegate.invalidate(); diff --git a/android_webview/java/src/org/chromium/android_webview/JsResultHandler.java b/android_webview/java/src/org/chromium/android_webview/JsResultHandler.java index 2d00265..53c0657 100644 --- a/android_webview/java/src/org/chromium/android_webview/JsResultHandler.java +++ b/android_webview/java/src/org/chromium/android_webview/JsResultHandler.java @@ -25,8 +25,7 @@ class JsResultHandler implements JsResultReceiver, JsPromptResultReceiver { ThreadUtils.runOnUiThread(new Runnable() { @Override public void run() { - if (mBridge != null) - mBridge.confirmJsResult(mId, promptResult); + if (mBridge != null) mBridge.confirmJsResult(mId, promptResult); mBridge = null; } }); @@ -37,8 +36,7 @@ class JsResultHandler implements JsResultReceiver, JsPromptResultReceiver { ThreadUtils.runOnUiThread(new Runnable() { @Override public void run() { - if (mBridge != null) - mBridge.cancelJsResult(mId); + if (mBridge != null) mBridge.cancelJsResult(mId); mBridge = null; } }); diff --git a/android_webview/java/src/org/chromium/android_webview/ScrollAccessibilityHelper.java b/android_webview/java/src/org/chromium/android_webview/ScrollAccessibilityHelper.java index 836d73e..310781a 100644 --- a/android_webview/java/src/org/chromium/android_webview/ScrollAccessibilityHelper.java +++ b/android_webview/java/src/org/chromium/android_webview/ScrollAccessibilityHelper.java @@ -57,8 +57,7 @@ class ScrollAccessibilityHelper { * {@link android.view.ViewConfiguration#getSendRecurringAccessibilityEventsInterval()} */ public void postViewScrolledAccessibilityEventCallback() { - if (mMsgViewScrolledQueued) - return; + if (mMsgViewScrolledQueued) return; mMsgViewScrolledQueued = true; Message msg = mHandler.obtainMessage(HandlerCallback.MSG_VIEW_SCROLLED); @@ -66,8 +65,7 @@ class ScrollAccessibilityHelper { } public void removePostedViewScrolledAccessibilityEventCallback() { - if (!mMsgViewScrolledQueued) - return; + if (!mMsgViewScrolledQueued) return; mMsgViewScrolledQueued = false; mHandler.removeMessages(HandlerCallback.MSG_VIEW_SCROLLED); diff --git a/android_webview/java/src/org/chromium/android_webview/permission/AwPermissionRequest.java b/android_webview/java/src/org/chromium/android_webview/permission/AwPermissionRequest.java index d0860f4..2eb0087 100644 --- a/android_webview/java/src/org/chromium/android_webview/permission/AwPermissionRequest.java +++ b/android_webview/java/src/org/chromium/android_webview/permission/AwPermissionRequest.java @@ -51,15 +51,17 @@ public class AwPermissionRequest { public void grant() { validate(); - if (mNativeAwPermissionRequest != 0) + if (mNativeAwPermissionRequest != 0) { nativeOnAccept(mNativeAwPermissionRequest, true); + } mProcessed = true; } public void deny() { validate(); - if (mNativeAwPermissionRequest != 0) + if (mNativeAwPermissionRequest != 0) { nativeOnAccept(mNativeAwPermissionRequest, false); + } mProcessed = true; } diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java index 59b53e3..77babfe 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java @@ -100,10 +100,8 @@ public class AndroidScrollIntegrationTest extends AwTestBase { @Override public void scrollTo(int x, int y) { - if (mMaxScrollXPix != -1) - x = Math.min(mMaxScrollXPix, x); - if (mMaxScrollYPix != -1) - y = Math.min(mMaxScrollYPix, y); + if (mMaxScrollXPix != -1) x = Math.min(mMaxScrollXPix, x); + if (mMaxScrollYPix != -1) y = Math.min(mMaxScrollYPix, y); super.scrollTo(x, y); mOnScrollToCallbackHelper.notifyCalled(); } diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java index 47eacd0..7599395 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java @@ -44,8 +44,7 @@ public class ArchiveTest extends AwTestBase { private void deleteFile(String path) { File file = new File(path); - if (file.exists()) - assertTrue(file.delete()); + if (file.exists()) assertTrue(file.delete()); assertFalse(file.exists()); } diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java index f8207dd..bf7bfbc 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java @@ -513,8 +513,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { + "})();"; String header = executeJavaScriptAndWaitForResult(awContents, contentsClient, syncGetJs); - if (header.equals("null")) - return null; + if (header.equals("null")) return null; // JSON stringification applied by executeJavaScriptAndWaitForResult adds quotes // around returned strings. assertTrue(header.length() > 2); diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java index 9f67c7b..e7efce7 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java @@ -61,8 +61,7 @@ public class HttpCacheTest extends AwTestBase { } private void deleteDirectory(File dir) throws Exception { - if (!dir.exists()) - return; + if (!dir.exists()) return; assertTrue(dir.isDirectory()); Process rmrf = Runtime.getRuntime().exec("rm -rf " + dir.getAbsolutePath()); rmrf.waitFor(); diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java index addbdbc..504a19f 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java @@ -106,8 +106,9 @@ public class LoadUrlTest extends AwTestBase { private static List<Pair<String, String>> createHeadersList(String[] namesAndValues) { List<Pair<String, String>> result = new ArrayList<Pair<String, String>>(); - for (int i = 0; i < namesAndValues.length; i += 2) + for (int i = 0; i < namesAndValues.length; i += 2) { result.add(Pair.create(namesAndValues[i], namesAndValues[i + 1])); + } return result; } diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java index 9dbdfbd..03a8659 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java @@ -25,8 +25,8 @@ public class ImagePageGenerator { "D+AQAA/9vaUwc", "D/AQEBANNhzkw" }; - private static final String IMAGE_PREFIX = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA" + - "6fptVAAAAAXNSR0IArs4c6QAAAA1JREFUCB0BAgD9/w"; + private static final String IMAGE_PREFIX = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA" + + "6fptVAAAAAXNSR0IArs4c6QAAAA1JREFUCB0BAgD9/w"; private static final String IMAGE_SUFFIX = "AAAAASUVORK5CYII="; diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java index 9f8f3d1..5f2b6ab 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java @@ -48,10 +48,10 @@ public class JSUtils { @Override public void run() { awContents.getWebContents().evaluateJavaScript( - "var evObj = document.createEvent('Events'); " + - "evObj.initEvent('click', true, false); " + - "document.getElementById('" + linkId + "').dispatchEvent(evObj);" + - "console.log('element with id [" + linkId + "] clicked');", + "var evObj = document.createEvent('Events'); " + + "evObj.initEvent('click', true, false); " + + "document.getElementById('" + linkId + "').dispatchEvent(evObj);" + + "console.log('element with id [" + linkId + "] clicked');", null); } }); diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoSurfaceViewUtils.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoSurfaceViewUtils.java index eb28048..0508be4 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoSurfaceViewUtils.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoSurfaceViewUtils.java @@ -120,15 +120,14 @@ public class VideoSurfaceViewUtils { private static int containsNumChildrenOfTypeOnUiThread(final View view, final Class<? extends View> childType, int sum) throws Exception { - if (childType.isInstance(view)) - return 1; + if (childType.isInstance(view)) return 1; if (view instanceof ViewGroup) { ViewGroup viewGroup = (ViewGroup) view; - for (int i = 0; i < viewGroup.getChildCount(); i++) + for (int i = 0; i < viewGroup.getChildCount(); i++) { sum += containsNumChildrenOfTypeOnUiThread(viewGroup.getChildAt(i), childType); + } } - return sum; } } diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java index fca2208..01c8a77 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java @@ -50,8 +50,9 @@ public class VideoTestUtil { testCase.loadDataAsync(awContents, data, "text/html", false); return observer.waitForEvent(waitTime); } finally { - if (webServer != null && webServer.getTestWebServer() != null) + if (webServer != null && webServer.getTestWebServer() != null) { webServer.getTestWebServer().shutdown(); + } } } } diff --git a/android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java b/android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java index 83a1b3d..a521792 100644 --- a/android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java +++ b/android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java @@ -34,7 +34,7 @@ public class TestContentProvider extends ContentProvider { private static final String TAG = "TestContentProvider"; private enum ColumnIndex { RESOURCE_REQUEST_COUNT_COLUMN, - }; + } private final Map<String, Integer> mResourceRequestCount; public static String createContentUrl(String target) { @@ -186,8 +186,8 @@ public class TestContentProvider extends ContentProvider { String resource = uri.getQuery(); if (GET_RESOURCE_REQUEST_COUNT.equals(action)) { return new ProviderStateCursor( - mResourceRequestCount.containsKey(resource) ? - mResourceRequestCount.get(resource) : 0); + mResourceRequestCount.containsKey(resource) + ? mResourceRequestCount.get(resource) : 0); } else if (RESET_RESOURCE_REQUEST_COUNT.equals(action)) { mResourceRequestCount.put(resource, 0); } diff --git a/android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java b/android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java index 42f6346..3b69ee7 100644 --- a/android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java +++ b/android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java @@ -55,10 +55,11 @@ class InputStreamUnittest { @Override public int read() { - if (mCount < size) + if (mCount < size) { return mCount++ % 256; - else + } else { return -1; + } } }; } diff --git a/base/android/javatests/src/org/chromium/base/ObserverListTest.java b/base/android/javatests/src/org/chromium/base/ObserverListTest.java index c28d51d..973682b 100644 --- a/base/android/javatests/src/org/chromium/base/ObserverListTest.java +++ b/base/android/javatests/src/org/chromium/base/ObserverListTest.java @@ -72,8 +72,7 @@ public class ObserverListTest extends InstrumentationTestCase { private static <T> int getSizeOfIterable(Iterable<T> iterable) { int num = 0; - for (T el : iterable) - num++; + for (T el : iterable) num++; return num; } @@ -91,8 +90,7 @@ public class ObserverListTest extends InstrumentationTestCase { observerList.addObserver(a); observerList.addObserver(b); - for (Observer obs : observerList) - obs.observe(10); + for (Observer obs : observerList) obs.observe(10); // Removing an observer not in the list should do nothing. observerList.removeObserver(e); @@ -101,8 +99,7 @@ public class ObserverListTest extends InstrumentationTestCase { observerList.addObserver(c); observerList.addObserver(d); - for (Observer obs : observerList) - obs.observe(10); + for (Observer obs : observerList) obs.observe(10); // observe should be called twice on a. assertEquals(20, a.mTotal); @@ -129,8 +126,7 @@ public class ObserverListTest extends InstrumentationTestCase { observerList.addObserver(a); observerList.addObserver(b); - for (Observer obs : observerList) - obs.observe(10); + for (Observer obs : observerList) obs.observe(10); assertTrue(observerList.hasObserver(c)); assertEquals(10, a.mTotal); diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java b/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java index ca6e73b..8765def8 100644 --- a/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java +++ b/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java @@ -29,12 +29,12 @@ public class TestFileUtil { Writer writer = null; try { writer = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); - writer.write("<html><meta charset=\"UTF-8\" />" + - "<head><title>" + title + "</title></head>" + - "<body>" + - (body != null ? body : "") + - "</body>" + - "</html>"); + writer.write("<html><meta charset=\"UTF-8\" />" + + " <head><title>" + title + "</title></head>" + + " <body>" + + (body != null ? body : "") + + " </body>" + + " </html>"); } finally { if (writer != null) { writer.close(); @@ -61,8 +61,8 @@ public class TestFileUtil { try { File f = new File(fileName); if (f.length() > sizeLimit) { - throw new IOException("File " + fileName + " length " + f.length() + - " exceeds limit " + sizeLimit); + throw new IOException("File " + fileName + " length " + f.length() + + " exceeds limit " + sizeLimit); } char[] buffer = new char[(int) f.length()]; reader = new InputStreamReader(new FileInputStream(f), "UTF-8"); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebappAuthenticator.java b/chrome/android/java/src/org/chromium/chrome/browser/WebappAuthenticator.java index f5c4ffa..480f946 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/WebappAuthenticator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/WebappAuthenticator.java @@ -129,8 +129,8 @@ public class WebappAuthenticator { byte[] keyBytes = key.getEncoded(); FileOutputStream output = null; if (MAC_KEY_BYTE_COUNT != keyBytes.length) { - Log.e(TAG, "writeKeyToFile got key encoded bytes length " + keyBytes.length + - "; expected " + MAC_KEY_BYTE_COUNT); + Log.e(TAG, "writeKeyToFile got key encoded bytes length " + keyBytes.length + + "; expected " + MAC_KEY_BYTE_COUNT); return false; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java index daeabac..e7e36f0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java @@ -177,8 +177,8 @@ public class ContextMenuParams { private static ContextMenuParams create(int mediaType, String linkUrl, String linkText, String unfilteredLinkUrl, String srcUrl, String selectionText, boolean isEditable, String sanitizedReferrer, int referrerPolicy) { - Referrer referrer = TextUtils.isEmpty(sanitizedReferrer) ? - null : new Referrer(sanitizedReferrer, referrerPolicy); + Referrer referrer = TextUtils.isEmpty(sanitizedReferrer) + ? null : new Referrer(sanitizedReferrer, referrerPolicy); return new ContextMenuParams(mediaType, linkUrl, linkText, unfilteredLinkUrl, srcUrl, selectionText, isEditable, referrer); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java b/chrome/android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java index 4f34fd3..0f72f68 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java @@ -266,8 +266,9 @@ public class CookiesFetcher { protected Void doInBackground(Void... voids) { File cookiesFile = new File(fetchFileName()); if (cookiesFile.exists()) { - if (!cookiesFile.delete()) + if (!cookiesFile.delete()) { Log.e(TAG, "Failed to delete " + cookiesFile.getName()); + } } return null; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/LockScreenTransportControl.java b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/LockScreenTransportControl.java index 5232309..06d7300 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/LockScreenTransportControl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/LockScreenTransportControl.java @@ -78,8 +78,7 @@ public abstract class LockScreenTransportControl } break; case KeyEvent.KEYCODE_MEDIA_STOP: - for (Listener listener : listeners) - listener.onStop(); + for (Listener listener : listeners) listener.onStop(); break; default: Log.w(TAG, "Unrecognized event: " + event); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/LockScreenTransportControlV18.java b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/LockScreenTransportControlV18.java index c435092..22a8a9f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/LockScreenTransportControlV18.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/LockScreenTransportControlV18.java @@ -74,8 +74,7 @@ class LockScreenTransportControlV18 extends LockScreenTransportControlV16 { @Override public void onPlaybackPositionUpdate(long position) { - for (Listener listener : getListeners()) - listener.onSeek((int) position); + for (Listener listener : getListeners()) listener.onSeek((int) position); } } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/SuggestionAnswer.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/SuggestionAnswer.java index efd5cfb8..a6eaff0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/SuggestionAnswer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/SuggestionAnswer.java @@ -106,17 +106,17 @@ public class SuggestionAnswer { mTextFields.add(new TextField(textValues.getJSONObject(i))); } - mAdditionalText = jsonLine.has(ANSWERS_JSON_ADDITIONAL_TEXT) ? - new TextField(jsonLine.getJSONObject(ANSWERS_JSON_ADDITIONAL_TEXT)) : - null; + mAdditionalText = jsonLine.has(ANSWERS_JSON_ADDITIONAL_TEXT) + ? new TextField(jsonLine.getJSONObject(ANSWERS_JSON_ADDITIONAL_TEXT)) + : null; - mStatusText = jsonLine.has(ANSWERS_JSON_STATUS_TEXT) ? - new TextField(jsonLine.getJSONObject(ANSWERS_JSON_STATUS_TEXT)) : - null; + mStatusText = jsonLine.has(ANSWERS_JSON_STATUS_TEXT) + ? new TextField(jsonLine.getJSONObject(ANSWERS_JSON_STATUS_TEXT)) + : null; - mImage = jsonLine.has(ANSWERS_JSON_IMAGE) ? - jsonLine.getJSONObject(ANSWERS_JSON_IMAGE).getString(ANSWERS_JSON_IMAGE_DATA) : - null; + mImage = jsonLine.has(ANSWERS_JSON_IMAGE) + ? jsonLine.getJSONObject(ANSWERS_JSON_IMAGE).getString(ANSWERS_JSON_IMAGE_DATA) + : null; } /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelOrderController.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelOrderController.java index 88176c8..02097cc 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelOrderController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelOrderController.java @@ -117,9 +117,9 @@ public class TabModelOrderController { * Determine if a launch type is the result of linked being clicked. */ static boolean linkClicked(TabLaunchType type) { - return type == TabLaunchType.FROM_LINK || - type == TabLaunchType.FROM_LONGPRESS_FOREGROUND || - type == TabLaunchType.FROM_LONGPRESS_BACKGROUND; + return type == TabLaunchType.FROM_LINK + || type == TabLaunchType.FROM_LONGPRESS_FOREGROUND + || type == TabLaunchType.FROM_LONGPRESS_BACKGROUND; } /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelAdapter.java index 96d738e..da22bbd 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelAdapter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelAdapter.java @@ -120,8 +120,8 @@ public class AccessibilityTabModelAdapter extends BaseAdapter { @Override public long getItemId(int position) { - return mUndoneTabModel != null ? - mUndoneTabModel.getTabAt(position).getId() : Tab.INVALID_TAB_ID; + return mUndoneTabModel != null + ? mUndoneTabModel.getTabAt(position).getId() : Tab.INVALID_TAB_ID; } @Override diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java index 3918475..8056441 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java @@ -35,11 +35,10 @@ public class ModalDialogTest extends ChromeShellTestBase { private static final String TAG = "ModalDialogTest"; private static final String EMPTY_PAGE = UrlUtils.encodeHtmlDataUri( "<html><title>Modal Dialog Test</title><p>Testcase.</p></title></html>"); - private static final String BEFORE_UNLOAD_URL = UrlUtils.encodeHtmlDataUri( - "<html>" + - "<head><script>window.onbeforeunload=function() {" + - "return 'Are you sure?';" + - "};</script></head></html>"); + private static final String BEFORE_UNLOAD_URL = UrlUtils.encodeHtmlDataUri("<html>" + + "<head><script>window.onbeforeunload=function() {" + + "return 'Are you sure?';" + + "};</script></head></html>"); @Override public void setUp() throws Exception { diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ProviderBookmarksUriTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ProviderBookmarksUriTest.java index 726e018..3a8d9ca 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ProviderBookmarksUriTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ProviderBookmarksUriTest.java @@ -203,8 +203,8 @@ public class ProviderBookmarksUriTest extends ProviderTestBase { values.put(BookmarkColumns.VISITS, visits[1]); String[] selectionArgs = { String.valueOf(lastUpdateTime[0]), String.valueOf(isBookmark[0]) }; - getContentResolver().update(uri, values, BookmarkColumns.FAVICON + " IS NOT NULL AND " + - BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?", + getContentResolver().update(uri, values, BookmarkColumns.FAVICON + " IS NOT NULL AND " + + BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?", selectionArgs); Cursor cursor = getContentResolver().query(uri, null, null, null, null); assertEquals(1, cursor.getCount()); @@ -253,8 +253,8 @@ public class ProviderBookmarksUriTest extends ProviderTestBase { String[] selectionArgs = { String.valueOf(lastUpdateTime[0]), String.valueOf(isBookmark[0]) }; - getContentResolver().delete(mBookmarksUri, BookmarkColumns.FAVICON + " IS NOT NULL AND " + - BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?", + getContentResolver().delete(mBookmarksUri, BookmarkColumns.FAVICON + " IS NOT NULL AND " + + BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?", selectionArgs); Cursor cursor = getContentResolver().query(uris[0], null, null, null, null); assertNotNull(cursor); @@ -264,8 +264,8 @@ public class ProviderBookmarksUriTest extends ProviderTestBase { assertEquals(1, cursor.getCount()); String[] selectionArgs1 = { String.valueOf(lastUpdateTime[1]), String.valueOf(isBookmark[1]) }; - getContentResolver().delete(mBookmarksUri, BookmarkColumns.FAVICON + " IS NULL AND " + - BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?", + getContentResolver().delete(mBookmarksUri, BookmarkColumns.FAVICON + " IS NULL AND " + + BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?", selectionArgs1); cursor = getContentResolver().query(uris[1], null, null, null, null); assertNotNull(cursor); diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ProviderSearchesUriTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ProviderSearchesUriTest.java index 0bf48f0..24a67f3c 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ProviderSearchesUriTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ProviderSearchesUriTest.java @@ -54,8 +54,8 @@ public class ProviderSearchesUriTest extends ProviderTestBase { Uri uri = addSearchTerm(searchTerm, searchTime); assertNotNull(uri); String[] selectionArgs = { searchTerm, String.valueOf(searchTime) }; - Cursor cursor = getContentResolver().query(uri, null, SearchColumns.SEARCH + "=? AND " + - SearchColumns.DATE + " = ? ", selectionArgs, null); + Cursor cursor = getContentResolver().query(uri, null, SearchColumns.SEARCH + "=? AND " + + SearchColumns.DATE + " = ? ", selectionArgs, null); assertNotNull(cursor); assertEquals(1, cursor.getCount()); assertTrue(cursor.moveToNext()); diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/translate/TranslateInfoBarTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/translate/TranslateInfoBarTest.java index a8d31c5..540b373 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/translate/TranslateInfoBarTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/translate/TranslateInfoBarTest.java @@ -34,8 +34,8 @@ public class TranslateInfoBarTest extends ChromeShellTestBase { } private static final String NEVER_TRANSLATE_MESSAGE = - "Would you like Google Chrome to offer to translate French pages from this" + - " site next time?"; + "Would you like Google Chrome to offer to translate French pages from this" + + " site next time?"; /** * Test the translate language panel. diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/omnibox/SuggestionPopup.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/omnibox/SuggestionPopup.java index ba28bfe..a87ebcb 100644 --- a/chrome/android/shell/java/src/org/chromium/chrome/shell/omnibox/SuggestionPopup.java +++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/omnibox/SuggestionPopup.java @@ -121,8 +121,7 @@ public class SuggestionPopup implements OnSuggestionsReceivedListener, TextWatch @Override public void onSuggestionsReceived(List<OmniboxSuggestion> suggestions, String inlineAutocompleteText) { - if (!mUrlField.isFocused() || suggestions.isEmpty()) - return; + if (!mUrlField.isFocused() || suggestions.isEmpty()) return; mSuggestionsPopupItemsCount = suggestions.size(); if (mSuggestionsPopup == null) { mSuggestionsPopup = new ListPopupWindow( diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java index ae8c4b8..68b0245 100644 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java @@ -460,10 +460,11 @@ public class BrowserAccessibilityManager { // this node and its subtree. If accessibility focus is on anything other than // the root, do it - otherwise set it to -1 so we don't load inline text boxes // for the whole subtree of the root. - if (mAccessibilityFocusId == mCurrentRootId) + if (mAccessibilityFocusId == mCurrentRootId) { nativeSetAccessibilityFocus(mNativeObj, -1); - else + } else { nativeSetAccessibilityFocus(mNativeObj, mAccessibilityFocusId); + } sendAccessibilityEvent(mAccessibilityFocusId, AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED); diff --git a/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java b/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java index fc3eb85..c27a60f 100644 --- a/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java +++ b/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java @@ -320,9 +320,13 @@ public class ImeAdapter { private int shouldSendKeyEventWithKeyCode(String text) { if (text.length() != 1) return COMPOSITION_KEY_CODE; - if (text.equals("\n")) return KeyEvent.KEYCODE_ENTER; - else if (text.equals("\t")) return KeyEvent.KEYCODE_TAB; - else return COMPOSITION_KEY_CODE; + if (text.equals("\n")) { + return KeyEvent.KEYCODE_ENTER; + } else if (text.equals("\t")) { + return KeyEvent.KEYCODE_TAB; + } else { + return COMPOSITION_KEY_CODE; + } } /** @@ -365,12 +369,14 @@ public class ImeAdapter { } // The content has grown in length: assume the last character is the key that caused it. - if (newtext.length() > oldtext.length() && newtext.startsWith(oldtext)) + if (newtext.length() > oldtext.length() && newtext.startsWith(oldtext)) { return androidKeyEventForCharacter(newtext.charAt(newtext.length() - 1)); + } // The content has shrunk in length: assume that backspace was pressed. - if (oldtext.length() > newtext.length() && oldtext.startsWith(newtext)) + if (oldtext.length() > newtext.length() && oldtext.startsWith(newtext)) { return new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL); + } // The content is unchanged or has undergone a complex change (i.e. not a simple tail // modification) so return an unknown key-code. diff --git a/content/public/android/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java b/content/public/android/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java index 71a22a4..d25c1f8 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java @@ -72,15 +72,11 @@ public class MediaResourceGetterTest extends InstrumentationTestCase { @Override public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) - return false; + if (this == obj) return true; + if (!super.equals(obj)) return false; + if (getClass() != obj.getClass()) return false; FakeFile other = (FakeFile) obj; - if (mExists != other.mExists) - return false; + if (mExists != other.mExists) return false; return true; } diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java index af0b0c2..1d1ebcc 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java @@ -45,11 +45,12 @@ public class ScreenOrientationListenerTest extends ContentShellTestBase { case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE: case ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT: case ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE: - if (expectedOrientation == currentOrientation) + if (expectedOrientation == currentOrientation) { return true; - else if (ALLOW_0_FOR_180 && expectedOrientation == 180 - && currentOrientation == 0) + } else if (ALLOW_0_FOR_180 && expectedOrientation == 180 + && currentOrientation == 0) { return true; + } return false; default: return false; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java index 0f273ec..9b626fd 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java @@ -52,8 +52,9 @@ public class TransitionTest extends ContentShellTestBase { @Override public void didDeferAfterResponseStarted(String markup, String cssSelector, String enteringColor) { - if (mWillFetchTransitionElements) + if (mWillFetchTransitionElements) { mWebContents.fetchTransitionElements(mWebContents.getUrl()); + } mDidCallDefer = true; mWebContents.resumeResponseDeferredAtStart(); mTransitionEnteringColor = enteringColor; diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/OrientationChangeObserverCriteria.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/OrientationChangeObserverCriteria.java index 5132c80..18ceeeb 100644 --- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/OrientationChangeObserverCriteria.java +++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/OrientationChangeObserverCriteria.java @@ -35,8 +35,7 @@ public class OrientationChangeObserverCriteria implements Criteria { @Override public boolean isSatisfied() { - if (!mObserver.mHasChanged) - return false; + if (!mObserver.mHasChanged) return false; return !mCheckTarget || mObserver.mOrientation == mTarget; } diff --git a/tools/android/checkstyle/chromium-style-5.0.xml b/tools/android/checkstyle/chromium-style-5.0.xml index c43f779..9e56dd9 100644 --- a/tools/android/checkstyle/chromium-style-5.0.xml +++ b/tools/android/checkstyle/chromium-style-5.0.xml @@ -101,8 +101,10 @@ <property name="severity" value="error"/> </module> <module name="NeedBraces"> - <property name="severity" value="info"/> - <property name="tokens" value="LITERAL_FOR, LITERAL_WHILE, LITERAL_DO"/> + <message key="needBraces" value="if, for, while, and do require curly braces unless they are single-line statements."/> + <property name="severity" value="error"/> + <property name="tokens" value="LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, LITERAL_IF"/> + <property name="allowSingleLineStatement" value="true"/> </module> <module name="EmptyBlock"> <property name="severity" value="error"/> |