From 94efb3bdf96cb3754ae4147880ddce6127c209db Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Mon, 2 Jun 2014 11:16:49 -0700
Subject: [PATCH] Bug 997477 - Part 3: Remove guards around
 urlBarTranslatingEdge in appropriate configs.

---
 .../android/base/toolbar/BrowserToolbar.java  | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index 03b80e6ecb7d..db90a4ab5e8b 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/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,
-                            PropertyAnimator.Property.TRANSLATION_X,
-                            entryTranslation);
-        }
-
+        animator.attach(urlBarTranslatingEdge,
+                        PropertyAnimator.Property.TRANSLATION_X,
+                        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) {
-            urlBarTranslatingEdge.setVisibility(View.INVISIBLE);
-            ViewHelper.setTranslationX(urlBarTranslatingEdge, 0);
-            if (shouldShrinkURLBar) {
-                urlBarEntry.setLayoutParams(urlBarEntryDefaultLayoutParams);
-            }
+        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,
-                                   PropertyAnimator.Property.TRANSLATION_X,
-                                   0);
-        }
-
+        contentAnimator.attach(urlBarTranslatingEdge,
+                               PropertyAnimator.Property.TRANSLATION_X,
+                               0);
         contentAnimator.attach(tabsButton,
                                PropertyAnimator.Property.TRANSLATION_X,
                                0);