Stop casting findViewById for var usage.
Bug: 352582031
Change-Id: Ic45898e1302286cfab57efbc36d46cf165230af1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5698646
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Commit-Queue: Sky Malice <skym@chromium.org>
Reviewed-by: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1326405}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBottomSheetStrategy.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBottomSheetStrategy.java
index f97a5cc..3de5c4a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBottomSheetStrategy.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabBottomSheetStrategy.java
@@ -348,7 +348,7 @@
mActivity, this::isFullHeight, () -> mStatus, this);
toolbar.setHandleStrategy(mHandleStrategy);
toolbar.setMinimizeButtonEnabled(false);
- var dragBar = (CustomTabDragBar) mActivity.findViewById(R.id.drag_bar);
+ CustomTabDragBar dragBar = mActivity.findViewById(R.id.drag_bar);
dragBar.setHandleStrategy(mHandleStrategy);
View dragHandle = mActivity.findViewById(R.id.drag_handle);
dragHandle.setOnClickListener(v -> onDragBarTapped());
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java
index 4a9da3c0..5867359 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java
@@ -332,7 +332,7 @@
*/
public void initSideSheetMaximizeButton(
boolean maximizedOnInit, MaximizeButtonCallback callback) {
- var maximizeButton = (ImageButton) findViewById(R.id.custom_tabs_sidepanel_maximize);
+ ImageButton maximizeButton = findViewById(R.id.custom_tabs_sidepanel_maximize);
if (maximizeButton == null) {
ViewStub maximizeButtonStub = findViewById(R.id.maximize_button_stub);
maximizeButtonStub.inflate();
@@ -374,7 +374,7 @@
}
private void setMaximizeButtonVisibility() {
- var maximizeButton = (ImageButton) findViewById(R.id.custom_tabs_sidepanel_maximize);
+ ImageButton maximizeButton = findViewById(R.id.custom_tabs_sidepanel_maximize);
if (!mMaximizeButtonEnabled || maximizeButton == null) {
if (maximizeButton != null) maximizeButton.setVisibility(View.GONE);
setUrlTitleBarMargin(0);
@@ -423,14 +423,14 @@
maximized
? R.string.custom_tab_side_sheet_minimize
: R.string.custom_tab_side_sheet_maximize;
- var maximizeButton = (ImageButton) findViewById(R.id.custom_tabs_sidepanel_maximize);
+ ImageButton maximizeButton = findViewById(R.id.custom_tabs_sidepanel_maximize);
var d = UiUtils.getTintedDrawable(getContext(), drawableId, mTint);
updateCustomActionButtonVisuals(maximizeButton, d, getResources().getString(buttonDescId));
}
/** Remove maximize button from side sheet CCT toolbar. */
public void removeSideSheetMaximizeButton() {
- var maximizeButton = (ImageButton) findViewById(R.id.custom_tabs_sidepanel_maximize);
+ ImageButton maximizeButton = findViewById(R.id.custom_tabs_sidepanel_maximize);
maximizeButton.setOnClickListener(null);
maximizeButton.setVisibility(View.GONE);
mMaximizeButtonEnabled = false;
@@ -445,7 +445,7 @@
ViewStub minimizeButtonStub = findViewById(R.id.minimize_button_stub);
minimizeButtonStub.inflate();
- var minimizeButton = (ImageButton) findViewById(R.id.custom_tabs_minimize_button);
+ ImageButton minimizeButton = findViewById(R.id.custom_tabs_minimize_button);
var d =
UiUtils.getTintedDrawable(
getContext(), MinimizedFeatureUtils.getMinimizeIcon(), mTint);
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarUnitTest.java
index 2030abd..9493427 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarUnitTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarUnitTest.java
@@ -393,7 +393,7 @@
MinimizedFeatureUtils.setDeviceEligibleForMinimizedCustomTabForTesting(true);
setup();
LinearLayout closeMinimizeLayout = mToolbar.findViewById(R.id.close_minimize_layout);
- var minimizeButton = (ImageButton) mToolbar.findViewById(R.id.custom_tabs_minimize_button);
+ ImageButton minimizeButton = mToolbar.findViewById(R.id.custom_tabs_minimize_button);
View titleUrlContainer = Mockito.mock(View.class);
when(titleUrlContainer.getLayoutParams())
.thenReturn(
@@ -428,8 +428,8 @@
@DisableFeatures({ChromeFeatureList.CCT_MINIMIZED})
public void testMinimizeButtonDisabled() {
LinearLayout closeMinimizeLayout = mToolbar.findViewById(R.id.close_minimize_layout);
- var minimizeButton = (ImageButton) mToolbar.findViewById(R.id.custom_tabs_minimize_button);
- var closeButton = (ImageButton) mToolbar.findViewById(R.id.close_button);
+ ImageButton minimizeButton = mToolbar.findViewById(R.id.custom_tabs_minimize_button);
+ ImageButton closeButton = mToolbar.findViewById(R.id.close_button);
// Button on left side
assertNull("Minimize button should never be initialized", minimizeButton);
diff --git a/chrome/browser/history/java/src/org/chromium/chrome/browser/history/AppFilterViewBinder.java b/chrome/browser/history/java/src/org/chromium/chrome/browser/history/AppFilterViewBinder.java
index 95390eb..f4365b3b3 100644
--- a/chrome/browser/history/java/src/org/chromium/chrome/browser/history/AppFilterViewBinder.java
+++ b/chrome/browser/history/java/src/org/chromium/chrome/browser/history/AppFilterViewBinder.java
@@ -15,7 +15,7 @@
class AppFilterViewBinder {
static void bind(PropertyModel model, View view, PropertyKey key) {
if (AppFilterProperties.ICON == key) {
- var icon = (ImageView) view.findViewById(R.id.start_icon);
+ ImageView icon = view.findViewById(R.id.start_icon);
icon.setImageDrawable(model.get(AppFilterProperties.ICON));
icon.setScaleType(ImageView.ScaleType.FIT_CENTER);
} else if (AppFilterProperties.LABEL == key) {
@@ -23,7 +23,7 @@
.setText(model.get(AppFilterProperties.LABEL));
view.findViewById(R.id.description).setVisibility(View.GONE);
} else if (AppFilterProperties.SELECTED == key) {
- var checkMark = (ImageView) view.findViewById(R.id.end_button);
+ ImageView checkMark = view.findViewById(R.id.end_button);
checkMark.setImageResource(R.drawable.ic_check_googblue_24dp);
boolean selected = model.get(AppFilterProperties.SELECTED);
checkMark.setVisibility(selected ? View.VISIBLE : View.INVISIBLE);
