Bug 997477 - Part 3: Remove guards around urlBarTranslatingEdge in appropriate configs.

mobile/android/base/toolbar/BrowserToolbar.java

@@ -1021,13 +1021,10 @@ public class BrowserToolbar extends ThemedRelativeLayout
             final int curveTranslation) {
         showUrlEditLayout();
 
-        if (urlBarTranslatingEdge != null) {
-            ViewHelper.setTranslationX(urlBarTranslatingEdge, entryTranslation);
-        }
-
         // Prevent taps through the editing mode cancel button (bug 1001243).
         tabsButton.setEnabled(false);
 
+        ViewHelper.setTranslationX(urlBarTranslatingEdge, entryTranslation);
         ViewHelper.setTranslationX(tabsButton, curveTranslation);
         ViewHelper.setTranslationX(tabsCounter, curveTranslation);
         ViewHelper.setTranslationX(actionItemBar, curveTranslation);
@@ -1070,12 +1067,9 @@ public class BrowserToolbar extends ThemedRelativeLayout
         urlDisplayLayout.prepareStartEditingAnimation();
 
         // Slide toolbar elements.
-        if (urlBarTranslatingEdge != null) {
+        animator.attach(urlBarTranslatingEdge,
-            animator.attach(urlBarTranslatingEdge,
+                        PropertyAnimator.Property.TRANSLATION_X,
-                            PropertyAnimator.Property.TRANSLATION_X,
+                        entryTranslation);
-                            entryTranslation);
-        }
-
         animator.attach(tabsButton,
                         PropertyAnimator.Property.TRANSLATION_X,
                         curveTranslation);
@@ -1160,16 +1154,14 @@ public class BrowserToolbar extends ThemedRelativeLayout
 
         updateTabCountAndAnimate(Tabs.getInstance().getDisplayCount());
 
-        if (urlBarTranslatingEdge != null) {
+        if (shouldShrinkURLBar) {
-            urlBarTranslatingEdge.setVisibility(View.INVISIBLE);
+            urlBarEntry.setLayoutParams(urlBarEntryDefaultLayoutParams);
-            ViewHelper.setTranslationX(urlBarTranslatingEdge, 0);
-            if (shouldShrinkURLBar) {
-                urlBarEntry.setLayoutParams(urlBarEntryDefaultLayoutParams);
-            }
         }
 
         tabsButton.setEnabled(true);
 
+        urlBarTranslatingEdge.setVisibility(View.INVISIBLE);
+        ViewHelper.setTranslationX(urlBarTranslatingEdge, 0);
         ViewHelper.setTranslationX(tabsButton, 0);
         ViewHelper.setTranslationX(tabsCounter, 0);
         ViewHelper.setTranslationX(actionItemBar, 0);
@@ -1204,12 +1196,9 @@ public class BrowserToolbar extends ThemedRelativeLayout
         contentAnimator.setUseHardwareLayer(false);
 
         // Slide the toolbar back to its original size.
-        if (urlBarTranslatingEdge != null) {
+        contentAnimator.attach(urlBarTranslatingEdge,
-            contentAnimator.attach(urlBarTranslatingEdge,
+                               PropertyAnimator.Property.TRANSLATION_X,
-                                   PropertyAnimator.Property.TRANSLATION_X,
+                               0);
-                                   0);
-        }
-
         contentAnimator.attach(tabsButton,
                                PropertyAnimator.Property.TRANSLATION_X,
                                0);