[NTP] Delay the URL focus effects if they happen before NTP is loaded.

When the URL bar is focused before the NTP is loaded, the UI misses
the events and renders in the incorrect state. This change just runs
the effects of the event later.

BUG=617582

Review-Url: https://codereview.chromium.org/2133753002
Cr-Commit-Position: refs/heads/master@{#404634}

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

@@ -165,6 +165,11 @@ public class NewTabPage
          */
         boolean isVoiceSearchEnabled();
 
+        /**
+         * @return Whether the URL bar is currently focused.
+         */
+        boolean isUrlBarFocused();
+
         /**
          * Focuses the URL bar when the user taps the fakebox, types in the fakebox, or pastes text
          * into the fakebox.
@@ -679,6 +684,13 @@ public class NewTabPage
         mFakeboxDelegate = fakeboxDelegate;
         if (mFakeboxDelegate != null) {
             mNewTabPageView.updateVoiceSearchButtonVisibility();
+
+            // The toolbar can't get the reference to the native page until its initialization is
+            // finished, so we can't cache it here and transfer it to the view later. We pull that
+            // state from the location bar when we get a reference to it as a workaround.
+            if (fakeboxDelegate.isUrlBarFocused()) {
+                mNewTabPageView.setUrlFocusChangeAnimationPercent(1f);
+            }
         }
     }
 

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java

@@ -113,6 +113,8 @@ public class NewTabPageView extends FrameLayout
     private float mUrlFocusChangePercent;
     private boolean mDisableUrlFocusChangeAnimations;
 
+    /** Flag used to request some layout changes after the next layout pass is completed. */
+    private boolean mTileCountChanged;
     private boolean mSnapshotMostVisitedChanged;
     private int mSnapshotWidth;
     private int mSnapshotHeight;
@@ -351,7 +353,7 @@ public class NewTabPageView extends FrameLayout
             params.bottomMargin = 0;
         }
 
-        addOnLayoutChangeListener(this);
+        mNewTabPageLayout.addOnLayoutChangeListener(this);
         setSearchProviderHasLogo(searchProviderHasLogo);
 
         mPendingLoadTasks++;
@@ -790,9 +792,11 @@ public class NewTabPageView extends FrameLayout
     @Override
     public void onLayoutChange(View v, int left, int top, int right, int bottom,
             int oldLeft, int oldTop, int oldRight, int oldBottom) {
-        int oldWidth = oldRight - oldLeft;
-        int newWidth = right - left;
-        if (oldWidth == newWidth) return;
+        int oldHeight = oldBottom - oldTop;
+        int newHeight = bottom - top;
+
+        if (oldHeight == newHeight && !mTileCountChanged) return;
+        mTileCountChanged = false;
 
         // Re-apply the url focus change amount after a rotation to ensure the views are correctly
         // placed with their new layout configurations.
@@ -875,6 +879,12 @@ public class NewTabPageView extends FrameLayout
         mHasReceivedMostVisitedSites = true;
         updateMostVisitedPlaceholderVisibility();
 
+        if (mUrlFocusChangePercent == 1f && oldItemCount != mMostVisitedItems.length) {
+            // If the number of NTP Tile rows change while the URL bar is focused, the icons'
+            // position will be wrong. Schedule the translation to be updated.
+            mTileCountChanged = true;
+        }
+
         if (isInitialLoad) {
             loadTaskCompleted();
             // The page contents are initially hidden; otherwise they'll be drawn centered on the