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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java

Issue 744453002: Fix a bunch of Java Checkstyle issues. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NeedsBraces to info Created 6 years, 1 month 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: chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
index b2ea6c4df20a7d5920a17968b8b1b6cd277e0c12..ff65ee62dcb2585d449c043ceb4a213905bcc2ce 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
@@ -85,13 +85,13 @@ public class ChromeBrowserProvider extends ContentProvider {
private static final String BROWSER_CONTRACT_HISTORY_CONTENT_ITEM_TYPE =
"vnd.android.cursor.item/browser-history";
private static final String BROWSER_CONTRACT_BOOKMARK_CONTENT_TYPE =
- "vnd.android.cursor.dir/bookmark";
+ "vnd.android.cursor.dir/bookmark";
private static final String BROWSER_CONTRACT_BOOKMARK_CONTENT_ITEM_TYPE =
- "vnd.android.cursor.item/bookmark";
+ "vnd.android.cursor.item/bookmark";
private static final String BROWSER_CONTRACT_SEARCH_CONTENT_TYPE =
- "vnd.android.cursor.dir/searches";
+ "vnd.android.cursor.dir/searches";
private static final String BROWSER_CONTRACT_SEARCH_CONTENT_ITEM_TYPE =
- "vnd.android.cursor.item/searches";
+ "vnd.android.cursor.item/searches";
// This Authority is for internal interface. It's concatenated with
// Context.getPackageName() so that we can install different channels
@@ -863,17 +863,17 @@ public class ChromeBrowserProvider extends ContentProvider {
* The existence of parent and children nodes is checked, but their contents are not.
*/
public boolean equalContents(BookmarkNode node) {
- return node != null &&
- mId == node.mId &&
- !(mName == null ^ node.mName == null) &&
- (mName == null || mName.equals(node.mName)) &&
- !(mUrl == null ^ node.mUrl == null) &&
- (mUrl == null || mUrl.equals(node.mUrl)) &&
- mType == node.mType &&
- byteArrayEqual(mFavicon, node.mFavicon) &&
- byteArrayEqual(mThumbnail, node.mThumbnail) &&
- !(mParent == null ^ node.mParent == null) &&
- children().size() == node.children().size();
+ return node != null
+ && mId == node.mId
+ && !(mName == null ^ node.mName == null)
+ && (mName == null || mName.equals(node.mName))
+ && !(mUrl == null ^ node.mUrl == null)
+ && (mUrl == null || mUrl.equals(node.mUrl))
+ && mType == node.mType
+ && byteArrayEqual(mFavicon, node.mFavicon)
+ && byteArrayEqual(mThumbnail, node.mThumbnail)
+ && !(mParent == null ^ node.mParent == null)
+ && children().size() == node.children().size();
}
private static boolean byteArrayEqual(byte[] byte1, byte[] byte2) {
@@ -1292,8 +1292,8 @@ public class ChromeBrowserProvider extends ContentProvider {
// devices whose API level is less than API 17.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
UserHandle callingUserHandle = Binder.getCallingUserHandle();
- if (callingUserHandle != null &&
- !callingUserHandle.equals(android.os.Process.myUserHandle())) {
+ if (callingUserHandle != null
+ && !callingUserHandle.equals(android.os.Process.myUserHandle())) {
ThreadUtils.postOnUiThread(new Runnable() {
@Override
public void run() {

Powered by Google App Engine
This is Rietveld 408576698