From 852f1655d8c345cb6d184222e3620eac2499c1f9 Mon Sep 17 00:00:00 2001
From: Prateek Arora <an0nym0usdroid42@gmail.com>
Date: Tue, 1 Sep 2015 22:12:31 +0530
Subject: [PATCH] Bug 1197441 - Remove BrowserToolbarBase.setButtonEnabled.
 r=mcomella

---
 .../android/base/toolbar/BrowserToolbarTablet.java   | 12 ++++++------
 .../base/toolbar/BrowserToolbarTabletBase.java       | 10 +++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/mobile/android/base/toolbar/BrowserToolbarTablet.java b/mobile/android/base/toolbar/BrowserToolbarTablet.java
index c4e238598c9..21593416176 100644
--- a/mobile/android/base/toolbar/BrowserToolbarTablet.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTablet.java
@@ -47,7 +47,7 @@ class BrowserToolbarTablet extends BrowserToolbarTabletBase {
         // We don't want users clicking the forward button in transitions, but we don't want it to
         // look disabled to avoid flickering complications (e.g. disabled in editing mode), so undo
         // the work of the super class' constructor.
-        setButtonEnabled(forwardButton, true);
+        forwardButton.setEnabled(true);
 
         updateForwardButtonState(ForwardButtonState.HIDDEN);
     }
@@ -171,8 +171,8 @@ class BrowserToolbarTablet extends BrowserToolbarTabletBase {
         // We already know the forward button state - no need to store it here.
         backButtonWasEnabledOnStartEditing = backButton.isEnabled();
 
-        setButtonEnabled(backButton, false);
-        setButtonEnabled(forwardButton, false);
+        backButton.setEnabled(false);
+        forwardButton.setEnabled(false);
 
         super.startEditing(url, animator);
     }
@@ -190,7 +190,7 @@ class BrowserToolbarTablet extends BrowserToolbarTabletBase {
         if (isEditing()) {
             stopEditingNewTablet();
 
-            setButtonEnabled(backButton, backButtonWasEnabledOnStartEditing);
+            backButton.setEnabled(backButtonWasEnabledOnStartEditing);
             updateForwardButtonState(forwardButtonState);
         }
 
@@ -198,10 +198,10 @@ class BrowserToolbarTablet extends BrowserToolbarTabletBase {
     }
 
     private void stopEditingNewTablet() {
-        // Undo the changes caused by calling setButtonEnabled in startEditing.
+        // Undo the changes caused by calling setEnabled for forwardButton in startEditing.
         // Note that this should be called first so the enabled state of the
         // forward button is set to the proper value.
-        setButtonEnabled(forwardButton, true);
+        forwardButton.setEnabled(true);
     }
 
     @Override
diff --git a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
index fb308db222d..40de5626e12 100644
--- a/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTabletBase.java
@@ -50,9 +50,9 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
         actionItemBar = (LinearLayout) findViewById(R.id.menu_items);
 
         backButton = (BackButton) findViewById(R.id.back);
-        setButtonEnabled(backButton, false);
+        backButton.setEnabled(false);
         forwardButton = (ForwardButton) findViewById(R.id.forward);
-        setButtonEnabled(forwardButton, false);
+        forwardButton.setEnabled(false);
         initButtonListeners();
 
         focusOrder.addAll(Arrays.asList(tabsButton, (View) backButton, (View) forwardButton, this));
@@ -113,7 +113,7 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
 
     @Override
     protected void updateNavigationButtons(final Tab tab) {
-        setButtonEnabled(backButton, canDoBack(tab));
+        backButton.setEnabled(canDoBack(tab));
         animateForwardButton(
                 canDoForward(tab) ? ForwardButtonAnimation.SHOW : ForwardButtonAnimation.HIDE);
     }
@@ -170,8 +170,4 @@ abstract class BrowserToolbarTabletBase extends BrowserToolbar {
     protected boolean canDoForward(final Tab tab) {
         return (tab.canDoForward() && !isEditing());
     }
-
-    protected static void setButtonEnabled(final ImageButton button, final boolean enabled) {
-        button.setEnabled(enabled);
-    }
 }