diff options
11 files changed, 11 insertions, 12 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java index afedf6b..6c92d62 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java @@ -146,7 +146,7 @@ public class ItemChooserDialog { @Override public View getView(int position, View convertView, ViewGroup parent) { TextView view; - if (convertView != null && convertView instanceof TextView) { + if (convertView instanceof TextView) { view = (TextView) convertView; } else { view = (TextView) mInflater.inflate( diff --git a/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java index 1e26c96..1c0ec2b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java @@ -214,7 +214,7 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt @Override public View getView(int position, View convertView, ViewGroup parent) { TextView view; - if (convertView != null && convertView instanceof TextView) { + if (convertView instanceof TextView) { view = (TextView) convertView; } else { view = mListItemFactory.createListItem(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java index d5e9c01..2a787d48 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java @@ -797,7 +797,7 @@ public class CompositorViewHolder extends FrameLayout if (show) { if (mView.getParent() != this) { // Make sure the view isn't a child of something else before we attempt to add it. - if (mView.getParent() != null && mView.getParent() instanceof ViewGroup) { + if (mView.getParent() instanceof ViewGroup) { ((ViewGroup) mView.getParent()).removeView(mView); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TitleBitmapFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TitleBitmapFactory.java index d7e04c5..ade69b8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TitleBitmapFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TitleBitmapFactory.java @@ -101,7 +101,7 @@ public class TitleBitmapFactory { if (favicon == null) { Drawable drawable = ApiCompatibilityUtils.getDrawable( context.getResources(), mNullFaviconResourceId); - if (drawable != null && drawable instanceof BitmapDrawable) { + if (drawable instanceof BitmapDrawable) { favicon = ((BitmapDrawable) drawable).getBitmap(); } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java index cd4c8fd..439e906 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.java @@ -325,7 +325,7 @@ public class CustomTab extends ChromeTab { private static void logTransactionTooLargeOrRethrow(RuntimeException e, Intent intent) { // See http://crbug.com/369574. - if (e.getCause() != null && e.getCause() instanceof TransactionTooLargeException) { + if (e.getCause() instanceof TransactionTooLargeException) { Log.e(TAG, "Could not resolve Activity for intent " + intent.toString(), e); } else { throw e; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java index 0045be7..c5094b0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java @@ -331,7 +331,7 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat private static void logTransactionTooLargeOrRethrow(RuntimeException e, Intent intent) { // See http://crbug.com/369574. - if (e.getCause() != null && e.getCause() instanceof TransactionTooLargeException) { + if (e.getCause() instanceof TransactionTooLargeException) { Log.e(TAG, "Could not resolve Activity for intent " + intent.toString(), e); } else { throw e; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ContentWrapperView.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ContentWrapperView.java index be4c312..c28eafa 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ContentWrapperView.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ContentWrapperView.java @@ -133,7 +133,6 @@ public class ContentWrapperView extends FrameLayout { if (mViewToShow != null) { // Move the View to this container. ViewParent parent = mViewToShow.getParent(); - assert parent != null && parent instanceof ViewGroup; ((ViewGroup) parent).removeView(mViewToShow); addChildView(mViewToShow); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxResultsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxResultsAdapter.java index e0d3e38..72e11b9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxResultsAdapter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxResultsAdapter.java @@ -56,7 +56,7 @@ public class OmniboxResultsAdapter extends BaseAdapter { @Override public View getView(int position, View convertView, ViewGroup parent) { SuggestionView suggestionView; - if (convertView != null && convertView instanceof SuggestionView) { + if (convertView instanceof SuggestionView) { suggestionView = (SuggestionView) convertView; } else { suggestionView = new SuggestionView(mContext, mLocationBar); 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 30afadf..b35114a 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 @@ -132,7 +132,7 @@ public class AccessibilityTabModelAdapter extends BaseAdapter { assert tabId != Tab.INVALID_TAB_ID; AccessibilityTabModelListItem listItem; - if (convertView != null && convertView instanceof AccessibilityTabModelListItem) { + if (convertView instanceof AccessibilityTabModelListItem) { listItem = (AccessibilityTabModelListItem) convertView; } else { listItem = (AccessibilityTabModelListItem) LayoutInflater.from(mContext).inflate( diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java b/sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java index 01f0ff4b..34b52e9 100644 --- a/sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java +++ b/sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java @@ -141,8 +141,8 @@ public class AccountHolder { @Override public boolean equals(Object that) { - return that != null && that instanceof AccountHolder && mAccount - .equals(((AccountHolder) that).getAccount()); + return that instanceof AccountHolder + && mAccount.equals(((AccountHolder) that).getAccount()); } public static Builder create() { diff --git a/ui/android/java/src/org/chromium/ui/ColorSuggestionListAdapter.java b/ui/android/java/src/org/chromium/ui/ColorSuggestionListAdapter.java index bdf255c..973898f 100644 --- a/ui/android/java/src/org/chromium/ui/ColorSuggestionListAdapter.java +++ b/ui/android/java/src/org/chromium/ui/ColorSuggestionListAdapter.java @@ -95,7 +95,7 @@ public class ColorSuggestionListAdapter extends BaseAdapter implements View.OnCl @Override public View getView(int position, View convertView, ViewGroup parent) { LinearLayout layout; - if (convertView != null && convertView instanceof LinearLayout) { + if (convertView instanceof LinearLayout) { layout = (LinearLayout) convertView; } else { layout = new LinearLayout(mContext); |