Get rid of ToolbarViewResourceFrameLayout

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.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.toolbar;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.Tab;
 import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;
 import org.chromium.chrome.browser.compositor.Invalidator;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.omnibox.LocationBar;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.SmoothProgressBar;
 import org.chromium.chrome.browser.widget.TintedImageButton;
+import org.chromium.chrome.browser.widget.ViewResourceFrameLayout;
 import org.chromium.ui.UiUtils;
+import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
 
 /**
  * Layout class that contains the base shared logic for manipulating the toolbar component. For
  * interaction that are not from Views inside Toolbar hierarchy all interactions should be done
  * through {@link Toolbar} rather than using this class directly.
  */
-abstract class ToolbarLayout extends FrameLayout implements Toolbar {
+abstract class ToolbarLayout extends ViewResourceFrameLayout implements Toolbar {
     protected static final int BACKGROUND_TRANSITION_DURATION_MS = 400;
 
     private Invalidator mInvalidator;
 
     private final int[] mTempPosition = new int[2];
 
     /**
      * The ImageButton view that represents the menu button.
      */
     protected TintedImageButton mMenuButton;
@@ skipping 12 matching lines @@
 
     private boolean mFindInPageToolbarShowing;
 
     /**
      * Basic constructor for {@link ToolbarLayout}.
      */
     public ToolbarLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
         mToolbarHeightWithoutShadow = getResources().getDimensionPixelOffset(
                 getToolbarHeightWithoutShadowResId());
+        setInitializedForCapture(false);
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
         mProgressBar = (SmoothProgressBar) findViewById(R.id.progress);
         if (mProgressBar != null) {
             removeView(mProgressBar);
             Drawable progressDrawable = mProgressBar.getProgressDrawable();
@@ skipping 272 matching lines @@
     protected void onTabContentViewChanged() {
         NewTabPage ntp = getToolbarDataProvider().getNewTabPageForCurrentTab();
         if (ntp != null) getLocationBar().onTabLoadingNTP(ntp);
     }
 
     @Override
     public boolean isReadyForTextureCapture() {
         return true;
     }
 
+    @Override
+    protected ViewResourceAdapter createResourceAdapter() {
+        return new ToolbarViewResourceAdapter((ViewGroup) getParent(), this);
+    }
+
     /**
      * @param attached Whether or not the web content is attached to the view heirarchy.
      */
     protected void setContentAttached(boolean attached) { }
 
     /**
      * Gives inheriting classes the chance to show or hide the TabSwitcher mode of this toolbar.
      * @param inTabSwitcherMode Whether or not TabSwitcher mode should be shown or hidden.
      * @param showToolbar    Whether or not to show the normal toolbar while animating.
      * @param delayAnimation Whether or not to delay the animation until after the transition has
@@ skipping 142 matching lines @@
     }
 
     /**
      * Opens hompage in the current tab.
      */
     protected void openHomepage() {
         getLocationBar().hideSuggestions();
         if (mToolbarTabController != null) mToolbarTabController.openHomepage();
     }
 }