Use accessor methods for accessing ToolbarLayout state

ToolbarLayout has protected fields and protected getters. This seems
redundant so this CL makes the fields private and makes other
classes use the getter methods.

Change-Id: Icbab2351080ba65e1a12c70b80eee7bab5ba560a
Reviewed-on: https://chromium-review.googlesource.com/1112354
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569811}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

@@ -488,7 +488,7 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
     }
 
     private void updateButtonsTint() {
-        mMenuButton.setTint(mUseDarkColors ? mDarkModeTint : mLightModeTint);
+        getMenuButton().setTint(mUseDarkColors ? mDarkModeTint : mLightModeTint);
         updateButtonTint(mCloseButton);
         int numCustomActionButtons = mCustomActionButtons.getChildCount();
         for (int i = 0; i < numCustomActionButtons; i++) {
@@ -791,7 +791,7 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
     @Override
     public View getMenuButtonWrapper() {
         // This class has no menu button wrapper, so return the menu button instead.
-        return mMenuButton;
+        return getMenuButton();
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

@@ -68,10 +68,10 @@ public abstract class ToolbarLayout extends FrameLayout implements Toolbar {
     /**
      * The ImageButton view that represents the menu button.
      */
-    protected TintedImageButton mMenuButton;
-    protected ImageView mMenuBadge;
-    protected View mMenuButtonWrapper;
-    protected AppMenuButtonHelper mAppMenuButtonHelper;
+    private TintedImageButton mMenuButton;
+    private ImageView mMenuBadge;
+    private View mMenuButtonWrapper;
+    private AppMenuButtonHelper mAppMenuButtonHelper;
 
     protected final ColorStateList mDarkModeTint;
     protected final ColorStateList mLightModeTint;
@@ -298,12 +298,19 @@ public abstract class ToolbarLayout extends FrameLayout implements Toolbar {
     }
 
     /**
-     * @return The view containing the menu button.
+     * @return The {@link TintedImageButton} containing the menu button.
      */
-    protected View getMenuButton() {
+    protected TintedImageButton getMenuButton() {
         return mMenuButton;
     }
 
+    /**
+     * @return The view containing the menu badge.
+     */
+    protected View getMenuBadge() {
+        return mMenuBadge;
+    }
+
     /**
      * @return The {@link ProgressBar} this layout uses.
      */

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

@@ -380,7 +380,7 @@ public class ToolbarPhone extends ToolbarLayout
 
             setLayoutTransition(null);
 
-            mMenuButtonWrapper.setVisibility(View.VISIBLE);
+            getMenuButtonWrapper().setVisibility(View.VISIBLE);
             inflateTabSwitchingResources();
 
             setWillNotDraw(false);
@@ -487,8 +487,9 @@ public class ToolbarPhone extends ToolbarLayout
         mToggleTabStackButton.setOnKeyListener(new KeyboardNavigationListener() {
             @Override
             public View getNextFocusForward() {
-                if (mMenuButton != null && mMenuButton.isShown()) {
-                    return mMenuButton;
+                final TintedImageButton menuButton = getMenuButton();
+                if (menuButton != null && menuButton.isShown()) {
+                    return menuButton;
                 } else {
                     return getCurrentTabView();
                 }
@@ -525,7 +526,7 @@ public class ToolbarPhone extends ToolbarLayout
             if (FeatureUtilities.isNewTabPageButtonEnabled()) changeIconToNTPIcon(mHomeButton);
         }
 
-        mMenuButton.setOnKeyListener(new KeyboardNavigationListener() {
+        getMenuButton().setOnKeyListener(new KeyboardNavigationListener() {
             @Override
             public View getNextFocusForward() {
                 return getCurrentTabView();
@@ -538,7 +539,7 @@ public class ToolbarPhone extends ToolbarLayout
 
             @Override
             protected boolean handleEnterKeyPress() {
-                return getMenuButtonHelper().onEnterKeyPress(mMenuButton);
+                return getMenuButtonHelper().onEnterKeyPress(getMenuButton());
             }
         });
         onHomeButtonUpdate(HomepageManager.isHomepageEnabled());
@@ -1382,11 +1383,12 @@ public class ToolbarPhone extends ToolbarLayout
         // Draw the menu button if necessary.
         if (!mShowMenuBadge && mTabSwitcherAnimationMenuDrawable != null
                 && mUrlExpansionPercent != 1f) {
-            mTabSwitcherAnimationMenuDrawable.setBounds(
-                    mMenuButton.getPaddingLeft(), mMenuButton.getPaddingTop(),
-                    mMenuButton.getWidth() - mMenuButton.getPaddingRight(),
-                    mMenuButton.getHeight() - mMenuButton.getPaddingBottom());
-            translateCanvasToView(mToolbarButtonsContainer, mMenuButton, canvas);
+            final TintedImageButton menuButton = getMenuButton();
+            mTabSwitcherAnimationMenuDrawable.setBounds(menuButton.getPaddingLeft(),
+                    menuButton.getPaddingTop(),
+                    menuButton.getWidth() - menuButton.getPaddingRight(),
+                    menuButton.getHeight() - menuButton.getPaddingBottom());
+            translateCanvasToView(mToolbarButtonsContainer, menuButton, canvas);
             mTabSwitcherAnimationMenuDrawable.setAlpha(rgbAlpha);
             int color = mUseLightDrawablesForTextureCapture
                     ? mLightModeDefaultColor
@@ -1400,11 +1402,11 @@ public class ToolbarPhone extends ToolbarLayout
                 ? mTabSwitcherAnimationMenuBadgeLightDrawable
                         : mTabSwitcherAnimationMenuBadgeDarkDrawable;
         if (mShowMenuBadge && badgeDrawable != null && mUrlExpansionPercent != 1f) {
-            badgeDrawable.setBounds(
-                    mMenuBadge.getPaddingLeft(), mMenuBadge.getPaddingTop(),
-                    mMenuBadge.getWidth() - mMenuBadge.getPaddingRight(),
-                    mMenuBadge.getHeight() - mMenuBadge.getPaddingBottom());
-            translateCanvasToView(mToolbarButtonsContainer, mMenuBadge, canvas);
+            final View menuBadge = getMenuBadge();
+            badgeDrawable.setBounds(menuBadge.getPaddingLeft(), menuBadge.getPaddingTop(),
+                    menuBadge.getWidth() - menuBadge.getPaddingRight(),
+                    menuBadge.getHeight() - menuBadge.getPaddingBottom());
+            translateCanvasToView(mToolbarButtonsContainer, menuBadge, canvas);
             badgeDrawable.setAlpha(rgbAlpha);
             badgeDrawable.draw(canvas);
         }
@@ -2081,12 +2083,12 @@ public class ToolbarPhone extends ToolbarLayout
                 URL_FOCUS_TOOLBAR_BUTTONS_TRANSLATION_X_DP, isRtl) * density;
 
         animator = ObjectAnimator.ofFloat(
-                mMenuButtonWrapper, TRANSLATION_X, toolbarButtonTranslationX);
+                getMenuButtonWrapper(), TRANSLATION_X, toolbarButtonTranslationX);
         animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
         animator.setInterpolator(BakedBezierInterpolator.FADE_OUT_CURVE);
         animators.add(animator);
 
-        animator = ObjectAnimator.ofFloat(mMenuButtonWrapper, ALPHA, 0);
+        animator = ObjectAnimator.ofFloat(getMenuButtonWrapper(), ALPHA, 0);
         animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
         animator.setInterpolator(BakedBezierInterpolator.FADE_OUT_CURVE);
         animators.add(animator);
@@ -2118,13 +2120,13 @@ public class ToolbarPhone extends ToolbarLayout
         animator.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
         animators.add(animator);
 
-        animator = ObjectAnimator.ofFloat(mMenuButtonWrapper, TRANSLATION_X, 0);
+        animator = ObjectAnimator.ofFloat(getMenuButtonWrapper(), TRANSLATION_X, 0);
         animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
         animator.setStartDelay(URL_CLEAR_FOCUS_MENU_DELAY_MS);
         animator.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
         animators.add(animator);
 
-        animator = ObjectAnimator.ofFloat(mMenuButtonWrapper, ALPHA, 1);
+        animator = ObjectAnimator.ofFloat(getMenuButtonWrapper(), ALPHA, 1);
         animator.setDuration(URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS);
         animator.setStartDelay(URL_CLEAR_FOCUS_MENU_DELAY_MS);
         animator.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
@@ -2620,7 +2622,7 @@ public class ToolbarPhone extends ToolbarLayout
             }
         }
 
-        mMenuButton.setTint(mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
+        getMenuButton().setTint(mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
         if (mLocationBar.useModernDesign()) {
             updateModernLocationBarColor(getLocationBarColorForToolbarColor(currentPrimaryColor));
         }
@@ -2699,8 +2701,8 @@ public class ToolbarPhone extends ToolbarLayout
         super.showAppMenuUpdateBadge();
 
         // Set up variables.
-        if (!mBrowsingModeViews.contains(mMenuBadge)) {
-            mBrowsingModeViews.add(mMenuBadge);
+        if (!mBrowsingModeViews.contains(getMenuBadge())) {
+            mBrowsingModeViews.add(getMenuBadge());
         }
 
         // Finish any in-progress animations and set the TabSwitcherAnimationMenuBadgeDrawables.
@@ -2720,8 +2722,8 @@ public class ToolbarPhone extends ToolbarLayout
     public void removeAppMenuUpdateBadge(boolean animate) {
         super.removeAppMenuUpdateBadge(animate);
 
-        if (mBrowsingModeViews.contains(mMenuBadge)) {
-            mBrowsingModeViews.remove(mMenuBadge);
+        if (mBrowsingModeViews.contains(getMenuBadge())) {
+            mBrowsingModeViews.remove(getMenuBadge());
             mTabSwitcherAnimationMenuBadgeDarkDrawable = null;
             mTabSwitcherAnimationMenuBadgeLightDrawable = null;
         }

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java

@@ -115,12 +115,12 @@ public class ToolbarTablet
 
         mBookmarkButton = (TintedImageButton) findViewById(R.id.bookmark_button);
 
-        mMenuButton = (TintedImageButton) findViewById(R.id.menu_button);
-        mMenuButtonWrapper.setVisibility(View.VISIBLE);
+        final View menuButtonWrapper = getMenuButtonWrapper();
+        menuButtonWrapper.setVisibility(View.VISIBLE);
 
         if (mAccessibilitySwitcherButton.getVisibility() == View.GONE
-                && mMenuButtonWrapper.getVisibility() == View.GONE) {
-            ViewCompat.setPaddingRelative((View) mMenuButtonWrapper.getParent(), 0, 0,
+                && menuButtonWrapper.getVisibility() == View.GONE) {
+            ViewCompat.setPaddingRelative((View) menuButtonWrapper.getParent(), 0, 0,
                     getResources().getDimensionPixelSize(R.dimen.tablet_toolbar_end_padding), 0);
         }
 
@@ -235,7 +235,7 @@ public class ToolbarTablet
         mBookmarkButton.setOnClickListener(this);
         mBookmarkButton.setOnLongClickListener(this);
 
-        mMenuButton.setOnKeyListener(new KeyboardNavigationListener() {
+        getMenuButton().setOnKeyListener(new KeyboardNavigationListener() {
             @Override
             public View getNextFocusForward() {
                 return getCurrentTabView();
@@ -248,7 +248,7 @@ public class ToolbarTablet
 
             @Override
             protected boolean handleEnterKeyPress() {
-                return getMenuButtonHelper().onEnterKeyPress(mMenuButton);
+                return getMenuButtonHelper().onEnterKeyPress(getMenuButton());
             }
         });
         if (HomepageManager.isHomepageEnabled()) {
@@ -380,7 +380,7 @@ public class ToolbarTablet
             getProgressBar().setThemeColor(
                     ApiCompatibilityUtils.getColor(getResources(), colorResource), isIncognito());
 
-            mMenuButton.setTint(incognito ? mLightModeTint : mDarkModeTint);
+            getMenuButton().setTint(incognito ? mLightModeTint : mDarkModeTint);
             mHomeButton.setTint(incognito ? mLightModeTint : mDarkModeTint);
             mBackButton.setTint(incognito ? mLightModeTint : mDarkModeTint);
             mForwardButton.setTint(incognito ? mLightModeTint : mDarkModeTint);
@@ -502,7 +502,7 @@ public class ToolbarTablet
             mReloadButton.setEnabled(false);
             mLocationBar.getContainerView().setVisibility(View.INVISIBLE);
             if (mShowMenuBadge) {
-                mMenuBadge.setVisibility(View.GONE);
+                getMenuBadge().setVisibility(View.GONE);
                 setMenuButtonContentDescription(false);
             }
         } else {