🍝🏠 Refactor MostVisited UI management, extract it for reuse in Home.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.ntp;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
 import android.support.annotation.Nullable;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.AdapterDataObserver;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.text.Editable;
-import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.base.Callback;
-import org.chromium.base.Log;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
 import org.chromium.chrome.browser.ntp.LogoBridge.Logo;
 import org.chromium.chrome.browser.ntp.LogoBridge.LogoObserver;
-import org.chromium.chrome.browser.ntp.MostVisitedItem.MostVisitedItemManager;
 import org.chromium.chrome.browser.ntp.NewTabPage.DestructionObserver;
 import org.chromium.chrome.browser.ntp.NewTabPage.OnSearchBoxScrollListener;
 import org.chromium.chrome.browser.ntp.cards.CardsVariationParameters;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageAdapter;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageRecyclerView;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
-import org.chromium.chrome.browser.profiles.MostVisitedSites.MostVisitedURLsObserver;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.suggestions.SuggestionsUiDelegate;
+import org.chromium.chrome.browser.suggestions.Tile;
+import org.chromium.chrome.browser.suggestions.TileGroup;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.MathUtils;
 import org.chromium.chrome.browser.util.ViewUtils;
-import org.chromium.chrome.browser.widget.RoundedIconGenerator;
 import org.chromium.chrome.browser.widget.displaystyle.UiConfig;
 import org.chromium.ui.base.DeviceFormFactor;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 import jp.tomorrowkey.android.gifplayer.BaseGifImage;
 
 /**
  * The native new tab page, represented by some basic data such as title and url, and an Android
  * View that displays the page.
  */
-public class NewTabPageView extends FrameLayout
-        implements MostVisitedURLsObserver, OnLayoutChangeListener {
+public class NewTabPageView
+        extends FrameLayout implements OnLayoutChangeListener, TileGroup.Observer {
+    private static final String TAG = "NewTabPageView";
 
     private static final long SNAP_SCROLL_DELAY_MS = 30;
-    private static final String TAG = "NewTabPageView";
+
+    private static final int MAX_TILES = 12;
+    private static final int MAX_TILE_ROWS_WITH_LOGO = 2;
+    private static final int MAX_TILE_ROWS_WITHOUT_LOGO = 3;
 
     private NewTabPageRecyclerView mRecyclerView;
 
     private NewTabPageLayout mNewTabPageLayout;
     private LogoView mSearchProviderLogoView;
     private View mSearchBoxView;
     private ImageView mVoiceSearchButton;
     private MostVisitedLayout mMostVisitedLayout;
     private View mMostVisitedPlaceholder;
     private View mNoSearchLogoSpacer;
 
     private OnSearchBoxScrollListener mSearchBoxScrollListener;
 
     private ChromeActivity mActivity;
     private NewTabPageManager mManager;
+    private TileGroup.Delegate mTileGroupDelegate;
+    private TileGroup mTileGroup;
     private UiConfig mUiConfig;
-    private MostVisitedDesign mMostVisitedDesign;
-    private MostVisitedItem[] mMostVisitedItems;
     private boolean mFirstShow = true;
     private boolean mSearchProviderHasLogo = true;
-    private boolean mHasReceivedMostVisitedSites;
     private boolean mPendingSnapScroll;
 
     /**
      * The number of asynchronous tasks that need to complete before the page is done loading.
      * This starts at one to track when the view is finished attaching to the window.
      */
     private int mPendingLoadTasks = 1;
     private boolean mLoadHasCompleted;
 
     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 boolean mNewTabPageRecyclerViewChanged;
     private int mSnapshotWidth;
     private int mSnapshotHeight;
     private int mSnapshotScrollY;
     private ContextMenuManager mContextMenuManager;
 
     /**
      * Manages the view interaction with the rest of the system.
      */
-    public interface NewTabPageManager extends MostVisitedItemManager, SuggestionsUiDelegate {
+    public interface NewTabPageManager extends SuggestionsUiDelegate {
         /** @return Whether the location bar is shown in the NTP. */
         boolean isLocationBarShownInNTP();
 
         /** @return Whether voice search is enabled and the microphone should be shown. */
         boolean isVoiceSearchEnabled();
 
         /** @return Whether the omnibox 'Search or type URL' text should be shown. */
         boolean isFakeOmniboxTextEnabledTablet();
 
         /**
          * Animates the search box up into the omnibox and bring up the keyboard.
          * @param beginVoiceSearch Whether to begin a voice search.
          * @param pastedText Text to paste in the omnibox after it's been focused. May be null.
          */
         void focusSearchBox(boolean beginVoiceSearch, String pastedText);
 
         /**
-         * Gets the list of most visited sites.
-         * @param observer The observer to be notified with the list of sites.
-         * @param numResults The maximum number of sites to retrieve.
-         */
-        void setMostVisitedURLsObserver(MostVisitedURLsObserver observer, int numResults);
-
-        /**
          * Called when the user clicks on the logo.
          * @param isAnimatedLogoShowing Whether the animated GIF logo is playing.
          */
         void onLogoClicked(boolean isAnimatedLogoShowing);
 
         /**
          * Gets the default search provider's logo and calls logoObserver with the result.
          * @param logoObserver The callback to notify when the logo is available.
          */
         void getSearchProviderLogo(LogoObserver logoObserver);
 
         /**
-         * Called when the NTP has completely finished loading (all views will be inflated
-         * and any dependent resources will have been loaded).
-         * @param mostVisitedItems The MostVisitedItem shown on the NTP. Used to record metrics.
-         */
-        void onLoadingComplete(MostVisitedItem[] mostVisitedItems);
-
-        /**
          * @return whether the {@link NewTabPage} associated with this manager is the current page
          * displayed to the user.
          */
         boolean isCurrentPage();
 
         /**
          * @return The context menu manager. Will be {@code null} if the {@link NewTabPageView} is
          * not done initialising.
          */
         @Nullable
@@ skipping 10 matching lines @@
     /**
      * Initializes the NTP. This must be called immediately after inflation, before this object is
      * used in any other way.
      *
      * @param manager NewTabPageManager used to perform various actions when the user interacts
      *                with the page.
      * @param tab The Tab that is showing this new tab page.
      * @param searchProviderHasLogo Whether the search provider has a logo.
      * @param scrollPosition The adapter scroll position to initialize to.
      */
-    public void initialize(
-            NewTabPageManager manager, Tab tab, boolean searchProviderHasLogo, int scrollPosition) {
+    public void initialize(NewTabPageManager manager, Tab tab, TileGroup.Delegate tileGroupDelegate,
+            boolean searchProviderHasLogo, int scrollPosition) {
         TraceEvent.begin(TAG + ".initialize()");
         mActivity = tab.getActivity();
         mManager = manager;
+        mTileGroupDelegate = tileGroupDelegate;
         mUiConfig = new UiConfig(this);
 
         assert manager.getSuggestionsSource() != null;
 
         mRecyclerView = (NewTabPageRecyclerView) findViewById(R.id.new_tab_page_recycler_view);
         // Don't attach now, the recyclerView itself will determine when to do it.
         mNewTabPageLayout =
                 (NewTabPageLayout) LayoutInflater.from(getContext())
                         .inflate(R.layout.new_tab_page_layout, mRecyclerView, false);
         mRecyclerView.setAboveTheFoldView(mNewTabPageLayout);
@@ skipping 17 matching lines @@
         mContextMenuManager =
                 new ContextMenuManager(mActivity, mManager.getNavigationDelegate(), mRecyclerView);
         mActivity.getWindowAndroid().addContextMenuCloseListener(mContextMenuManager);
         manager.addDestructionObserver(new DestructionObserver() {
             @Override
             public void onDestroy() {
                 mActivity.getWindowAndroid().removeContextMenuCloseListener(mContextMenuManager);
             }
         });
 
-        mMostVisitedDesign = new MostVisitedDesign(getContext());
         mMostVisitedLayout =
                 (MostVisitedLayout) mNewTabPageLayout.findViewById(R.id.most_visited_layout);
-        mMostVisitedDesign.initMostVisitedLayout(searchProviderHasLogo);
+        mMostVisitedLayout.setMaxRows(
+                searchProviderHasLogo ? MAX_TILE_ROWS_WITH_LOGO : MAX_TILE_ROWS_WITHOUT_LOGO);
+        mTileGroup = new TileGroup(
+                mManager, mContextMenuManager, mTileGroupDelegate, /* observer = */ this);
 
         mSearchProviderLogoView =
                 (LogoView) mNewTabPageLayout.findViewById(R.id.search_provider_logo);
         mSearchBoxView = mNewTabPageLayout.findViewById(R.id.search_box);
         mNoSearchLogoSpacer = mNewTabPageLayout.findViewById(R.id.no_search_logo_spacer);
 
         initializeSearchBoxTextView();
         initializeVoiceSearchButton();
 
         mNewTabPageLayout.addOnLayoutChangeListener(this);
         setSearchProviderHasLogo(searchProviderHasLogo);
 
         mPendingLoadTasks++;
-        mManager.setMostVisitedURLsObserver(
-                this, mMostVisitedDesign.getNumberOfTiles(searchProviderHasLogo));
+        mTileGroup.startObserving(MAX_TILES);
 
         // Set up snippets
         NewTabPageAdapter newTabPageAdapter = new NewTabPageAdapter(mManager, mNewTabPageLayout,
                 mUiConfig, OfflinePageBridge.getForProfile(Profile.getLastUsedProfile()),
-                mContextMenuManager);
+                mContextMenuManager, /* tileGroupDelegate = */ null);
         mRecyclerView.setAdapter(newTabPageAdapter);
 
         int scrollOffset;
         if (CardsVariationParameters.isScrollBelowTheFoldEnabled()) {
             scrollPosition = newTabPageAdapter.getFirstHeaderPosition();
             scrollOffset = getResources().getDimensionPixelSize(R.dimen.ntp_search_box_height);
         } else {
             scrollOffset = 0;
         }
         mRecyclerView.getLinearLayoutManager().scrollToPositionWithOffset(
@@ skipping 198 matching lines @@
      * is complete.
      */
     private void loadTaskCompleted() {
         assert mPendingLoadTasks > 0;
         mPendingLoadTasks--;
         if (mPendingLoadTasks == 0) {
             if (mLoadHasCompleted) {
                 assert false;
             } else {
                 mLoadHasCompleted = true;
-                mManager.onLoadingComplete(mMostVisitedItems);
+                mTileGroupDelegate.onLoadingComplete(mTileGroup.getTiles());
                 // Load the logo after everything else is finished, since it's lower priority.
                 loadSearchProviderLogo();
             }
         }
     }
 
     /**
      * Loads the search provider logo (e.g. Google doodle), if any.
      */
     private void loadSearchProviderLogo() {
@@ skipping 10 matching lines @@
 
     /**
      * Changes the layout depending on whether the selected search provider (e.g. Google, Bing)
      * has a logo.
      * @param hasLogo Whether the search provider has a logo.
      */
     public void setSearchProviderHasLogo(boolean hasLogo) {
         if (hasLogo == mSearchProviderHasLogo) return;
         mSearchProviderHasLogo = hasLogo;
 
-        mMostVisitedDesign.setSearchProviderHasLogo(mMostVisitedLayout, hasLogo);
+        // Set a bit more top padding if there is no logo.
+        int paddingTop = getResources().getDimensionPixelSize(hasLogo
+                        ? R.dimen.most_visited_layout_padding_top
+                        : R.dimen.most_visited_layout_no_logo_padding_top);
+        mMostVisitedLayout.setPadding(0, paddingTop, 0, mMostVisitedLayout.getPaddingBottom());
 
         // Hide or show all the views above the Most Visited items.
         int visibility = hasLogo ? View.VISIBLE : View.GONE;
         int childCount = mNewTabPageLayout.getChildCount();
         for (int i = 0; i < childCount; i++) {
             View child = mNewTabPageLayout.getChildAt(i);
             if (child == mMostVisitedLayout) break;
             // Don't change the visibility of a ViewStub as that will automagically inflate it.
             if (child instanceof ViewStub) continue;
             child.setVisibility(visibility);
@@ skipping 218 matching lines @@
         onUrlFocusAnimationChanged();
         updateSearchBoxOnScroll();
 
         mRecyclerView.updatePeekingCardAndHeader();
         // The positioning of elements may have been changed (since the elements expand to fill
         // the available vertical space), so adjust the scroll.
         mRecyclerView.snapScroll(mSearchBoxView,
                 mRecyclerView.computeVerticalScrollOffset(), getHeight());
     }
 
-    // MostVisitedURLsObserver implementation
-
-    @Override
-    public void onMostVisitedURLsAvailable(final String[] titles, final String[] urls,
-            final String[] whitelistIconPaths, final int[] sources) {
-        Set<String> urlSet = new HashSet<>(Arrays.asList(urls));
-
-        // If no Most Visited items have been built yet, this is the initial load. Build the Most
-        // Visited items immediately so the layout is stable during initial rendering. They can be
-        // replaced later if there are offline urls, but that will not affect the layout widths and
-        // heights. A stable layout enables reliable scroll position initialization.
-        if (!mHasReceivedMostVisitedSites) {
-            buildMostVisitedItems(titles, urls, whitelistIconPaths, null, sources);
-        }
-
-        // TODO(https://crbug.com/607573): We should show offline-available content in a nonblocking
-        // way so that responsiveness of the NTP does not depend on ready availability of offline
-        // pages.
-        mManager.getUrlsAvailableOffline(urlSet, new Callback<Set<String>>() {
-            @Override
-            public void onResult(Set<String> offlineUrls) {
-                buildMostVisitedItems(titles, urls, whitelistIconPaths, offlineUrls, sources);
-            }
-        });
-    }
-
-    private void buildMostVisitedItems(final String[] titles, final String[] urls,
-            final String[] whitelistIconPaths, @Nullable final Set<String> offlineUrls,
-            final int[] sources) {
-        mMostVisitedLayout.removeAllViews();
-
-        MostVisitedItem[] oldItems = mMostVisitedItems;
-        int oldItemCount = oldItems == null ? 0 : oldItems.length;
-        mMostVisitedItems = new MostVisitedItem[titles.length];
-
-        final boolean isInitialLoad = !mHasReceivedMostVisitedSites;
-        LayoutInflater inflater = LayoutInflater.from(getContext());
-
-        // Add the most visited items to the page.
-        for (int i = 0; i < titles.length; i++) {
-            final String url = urls[i];
-            final String title = titles[i];
-            final String whitelistIconPath = whitelistIconPaths[i];
-            final int source = sources[i];
-
-            boolean offlineAvailable = offlineUrls != null && offlineUrls.contains(url);
-
-            // Look for an existing item to reuse.
-            MostVisitedItem item = null;
-            for (int j = 0; j < oldItemCount; j++) {
-                MostVisitedItem oldItem = oldItems[j];
-                if (oldItem != null && TextUtils.equals(url, oldItem.getUrl())
-                        && TextUtils.equals(title, oldItem.getTitle())
-                        && offlineAvailable == oldItem.isOfflineAvailable()
-                        && whitelistIconPath.equals(oldItem.getWhitelistIconPath())) {
-                    item = oldItem;
-                    item.setIndex(i);
-                    oldItems[j] = null;
-                    break;
-                }
-            }
-
-            // If nothing can be reused, create a new item.
-            if (item == null) {
-                item = new MostVisitedItem(mManager, title, url, whitelistIconPath,
-                        offlineAvailable, i, source);
-                View view =
-                        mMostVisitedDesign.createMostVisitedItemView(inflater, item, isInitialLoad);
-                item.initView(view);
-            }
-
-            mMostVisitedItems[i] = item;
-            mMostVisitedLayout.addView(item.getView());
-        }
-
-        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
-            // page before the most visited sites are available and then jump upwards to make space
-            // once the most visited sites are available.
-            mNewTabPageLayout.setVisibility(View.VISIBLE);
-        }
-        mSnapshotMostVisitedChanged = true;
-    }
-
-    @Override
-    public void onIconMadeAvailable(String siteUrl) {
-        mMostVisitedDesign.onIconUpdated(siteUrl);
-    }
-
     /**
      * Shows the most visited placeholder ("Nothing to see here") if there are no most visited
      * items and there is no search provider logo.
      */
     private void updateMostVisitedPlaceholderVisibility() {
-        boolean showPlaceholder = mHasReceivedMostVisitedSites
-                && mMostVisitedLayout.getChildCount() == 0
-                && !mSearchProviderHasLogo;
+        boolean showPlaceholder = mTileGroup.hasReceivedData()
+                && mMostVisitedLayout.getChildCount() == 0 && !mSearchProviderHasLogo;
 
         mNoSearchLogoSpacer.setVisibility(
                 (mSearchProviderHasLogo || showPlaceholder) ? View.GONE : View.INVISIBLE);
 
         if (showPlaceholder) {
             if (mMostVisitedPlaceholder == null) {
                 ViewStub mostVisitedPlaceholderStub = (ViewStub) mNewTabPageLayout
                         .findViewById(R.id.most_visited_placeholder_stub);
 
                 mMostVisitedPlaceholder = mostVisitedPlaceholderStub.inflate();
             }
             mMostVisitedLayout.setVisibility(GONE);
             mMostVisitedPlaceholder.setVisibility(VISIBLE);
         } else if (mMostVisitedPlaceholder != null) {
             mMostVisitedLayout.setVisibility(VISIBLE);
             mMostVisitedPlaceholder.setVisibility(GONE);
         }
     }
 
-    /**
-     * The design for most visited tiles: each tile shows a large icon and the site's title.
-     */
-    private class MostVisitedDesign {
-
-        private static final int NUM_TILES = 8;
-        private static final int NUM_TILES_NO_LOGO = 12;
-        private static final int MAX_ROWS = 2;
-        private static final int MAX_ROWS_NO_LOGO = 3;
-
-        private static final int ICON_CORNER_RADIUS_DP = 4;
-        private static final int ICON_TEXT_SIZE_DP = 20;
-        private static final int ICON_MIN_SIZE_PX = 48;
-
-        private int mMinIconSize;
-        private int mDesiredIconSize;
-        private RoundedIconGenerator mIconGenerator;
-
-        MostVisitedDesign(Context context) {
-            Resources res = context.getResources();
-            mDesiredIconSize = res.getDimensionPixelSize(R.dimen.most_visited_icon_size);
-            // On ldpi devices, mDesiredIconSize could be even smaller than ICON_MIN_SIZE_PX.
-            mMinIconSize = Math.min(mDesiredIconSize, ICON_MIN_SIZE_PX);
-            int desiredIconSizeDp = Math.round(
-                    mDesiredIconSize / res.getDisplayMetrics().density);
-            int iconColor = ApiCompatibilityUtils.getColor(
-                    getResources(), R.color.default_favicon_background_color);
-            mIconGenerator = new RoundedIconGenerator(context, desiredIconSizeDp, desiredIconSizeDp,
-                    ICON_CORNER_RADIUS_DP, iconColor, ICON_TEXT_SIZE_DP);
-        }
-
-        public int getNumberOfTiles(boolean searchProviderHasLogo) {
-            return searchProviderHasLogo ? NUM_TILES : NUM_TILES_NO_LOGO;
-        }
-
-        public void initMostVisitedLayout(boolean searchProviderHasLogo) {
-            mMostVisitedLayout.setMaxRows(searchProviderHasLogo ? MAX_ROWS : MAX_ROWS_NO_LOGO);
-        }
-
-        public void setSearchProviderHasLogo(View mostVisitedLayout, boolean hasLogo) {
-            int paddingTop = getResources().getDimensionPixelSize(hasLogo
-                    ? R.dimen.most_visited_layout_padding_top
-                    : R.dimen.most_visited_layout_no_logo_padding_top);
-            mostVisitedLayout.setPadding(0, paddingTop, 0, mMostVisitedLayout.getPaddingBottom());
-        }
-
-        class LargeIconCallbackImpl implements LargeIconCallback {
-            private MostVisitedItem mItem;
-            private MostVisitedItemView mItemView;
-            private boolean mIsInitialLoad;
-
-            public LargeIconCallbackImpl(
-                    MostVisitedItem item, MostVisitedItemView itemView, boolean isInitialLoad) {
-                mItem = item;
-                mItemView = itemView;
-                mIsInitialLoad = isInitialLoad;
-            }
-
-            @Override
-            public void onLargeIconAvailable(
-                    Bitmap icon, int fallbackColor, boolean isFallbackColorDefault) {
-                if (icon == null) {
-                    mIconGenerator.setBackgroundColor(fallbackColor);
-                    icon = mIconGenerator.generateIconForUrl(mItem.getUrl());
-                    mItemView.setIcon(new BitmapDrawable(getResources(), icon));
-                    mItem.setTileType(isFallbackColorDefault ? MostVisitedTileType.ICON_DEFAULT
-                                                             : MostVisitedTileType.ICON_COLOR);
-                } else {
-                    RoundedBitmapDrawable roundedIcon = RoundedBitmapDrawableFactory.create(
-                            getResources(), icon);
-                    int cornerRadius = Math.round(ICON_CORNER_RADIUS_DP
-                            * getResources().getDisplayMetrics().density * icon.getWidth()
-                            / mDesiredIconSize);
-                    roundedIcon.setCornerRadius(cornerRadius);
-                    roundedIcon.setAntiAlias(true);
-                    roundedIcon.setFilterBitmap(true);
-                    mItemView.setIcon(roundedIcon);
-                    mItem.setTileType(MostVisitedTileType.ICON_REAL);
-                }
-                mSnapshotMostVisitedChanged = true;
-                if (mIsInitialLoad) loadTaskCompleted();
-            }
-        }
-
-        public View createMostVisitedItemView(
-                LayoutInflater inflater, MostVisitedItem item, boolean isInitialLoad) {
-            final MostVisitedItemView view = (MostVisitedItemView) inflater.inflate(
-                    R.layout.most_visited_item, mMostVisitedLayout, false);
-            view.setTitle(TitleUtil.getTitleForDisplay(item.getTitle(), item.getUrl()));
-            view.setOfflineAvailable(item.isOfflineAvailable());
-
-            LargeIconCallback iconCallback = new LargeIconCallbackImpl(item, view, isInitialLoad);
-            if (isInitialLoad) mPendingLoadTasks++;
-            if (!loadWhitelistIcon(item, iconCallback)) {
-                mManager.getLargeIconForUrl(item.getUrl(), mMinIconSize, iconCallback);
-            }
-
-            return view;
-        }
-
-        private boolean loadWhitelistIcon(MostVisitedItem item, LargeIconCallback iconCallback) {
-            if (item.getWhitelistIconPath().isEmpty()) return false;
-
-            Bitmap bitmap = BitmapFactory.decodeFile(item.getWhitelistIconPath());
-            if (bitmap == null) {
-                Log.d(TAG, "Image decoding failed: %s", item.getWhitelistIconPath());
-                return false;
-            }
-            iconCallback.onLargeIconAvailable(bitmap, Color.BLACK, false);
-            return true;
-        }
-
-        public void onIconUpdated(final String url) {
-            if (mMostVisitedItems == null) return;
-            // Find a matching most visited item.
-            for (MostVisitedItem item : mMostVisitedItems) {
-                if (item.getUrl().equals(url)) {
-                    LargeIconCallback iconCallback = new LargeIconCallbackImpl(
-                            item, (MostVisitedItemView) item.getView(), false);
-                    mManager.getLargeIconForUrl(url, mMinIconSize, iconCallback);
-                    break;
-                }
-            }
-        }
-    }
-
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (mNewTabPageLayout != null) {
             mNewTabPageLayout.setParentViewportHeight(MeasureSpec.getSize(heightMeasureSpec));
         }
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
         mRecyclerView.updatePeekingCardAndHeader();
     }
 
@@ skipping 16 matching lines @@
      * @return The adapter position the user has scrolled to.
      */
     public int getScrollPosition() {
         return mRecyclerView.getScrollPosition();
     }
 
     /** @return the context menu manager. */
     public ContextMenuManager getContextMenuManager() {
         return mContextMenuManager;
     }
+
+    // TileGroup.Observer interface.
+
+    @Override
+    public void onInitialTileDataLoaded() {
+        // The page contents are initially hidden; otherwise they'll be drawn centered on the
+        // page before the most visited sites are available and then jump upwards to make space
+        // once the most visited sites are available.
+        onTileDataChanged();
+        mNewTabPageLayout.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void onTileDataChanged() {
+        mTileGroup.renderTileViews(mMostVisitedLayout, !mLoadHasCompleted);
+        mSnapshotMostVisitedChanged = true;
+    }
+
+    @Override
+    public void onTileCountChanged() {
+        // If the number of tile rows change while the URL bar is focused, the icons'
+        // position will be wrong. Schedule the translation to be updated.
+        if (mUrlFocusChangePercent == 1f) mTileCountChanged = true;
+        updateMostVisitedPlaceholderVisibility();
+    }
+
+    @Override
+    public void onTileIconChanged(Tile tile) {
+        mMostVisitedLayout.updateIconView(tile.getUrl(), tile.getIcon());
+        mSnapshotMostVisitedChanged = true;
+    }
+
+    @Override
+    public void onLoadTaskAdded() {
+        mPendingLoadTasks++;
+    }
+
+    @Override
+    public void onLoadTaskCompleted() {
+        loadTaskCompleted();
+    }
 }