--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -1199,25 +1199,25 @@ public class BrowserToolbar extends Geck
     private void hideUrlEditContainer() {
         setUrlEditContainerVisibility(false, null);
     }
 
     private void hideUrlEditContainer(PropertyAnimator animator) {
         setUrlEditContainerVisibility(false, animator);
     }
 
-    private void setUrlEditContainerVisibility(final boolean visible, PropertyAnimator animator) {
-        final View viewToShow = (visible ? mUrlEditContainer : mUrlDisplayContainer);
-        final View viewToHide = (visible ? mUrlDisplayContainer : mUrlEditContainer);
+    private void setUrlEditContainerVisibility(final boolean showEditContainer, PropertyAnimator animator) {
+        final View viewToShow = (showEditContainer ? mUrlEditContainer : mUrlDisplayContainer);
+        final View viewToHide = (showEditContainer ? mUrlDisplayContainer : mUrlEditContainer);
 
         if (animator == null) {
             viewToHide.setVisibility(View.GONE);
             viewToShow.setVisibility(View.VISIBLE);
 
-            if (visible) {
+            if (showEditContainer) {
                 mUrlEditText.requestFocus();
                 showSoftInput();
             }
 
             return;
         }
 
         ViewHelper.setAlpha(viewToShow, 0.0f);
@@ -1229,28 +1229,28 @@ public class BrowserToolbar extends Geck
                         PropertyAnimator.Property.ALPHA,
                         0.0f);
 
         animator.addPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {
             @Override
             public void onPropertyAnimationStart() {
                 viewToShow.setVisibility(View.VISIBLE);
 
-                if (visible) {
+                if (showEditContainer) {
                     ViewHelper.setAlpha(mGo, 0.0f);
                     mUrlEditText.requestFocus();
                 }
             }
 
             @Override
             public void onPropertyAnimationEnd() {
                 ViewHelper.setAlpha(viewToHide, 1.0f);
                 viewToHide.setVisibility(View.GONE);
 
-                if (visible) {
+                if (showEditContainer) {
                     ViewHelper.setAlpha(mGo, 1.0f);
                     showSoftInput();
                 }
             }
         });
     }
 
     public boolean isEditing() {