ui: Cleanup class/struct forward declarations

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchCaptionControl.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchCaptionControl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchCaptionControl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchCaptionControl.java
index 2cff20fc2e654f5bd6ea7a135f7cd12099c24700..b223e7c1dae51b9fc5fe4306dc20eb5c5d493cdc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchCaptionControl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchCaptionControl.java
@@ -15,7 +15,7 @@ import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelAnimation;
-import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelInflater;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelTextViewInflater;
 import org.chromium.chrome.browser.compositor.layouts.ChromeAnimation;
 import org.chromium.chrome.browser.compositor.layouts.ChromeAnimation.Animatable;
 import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
@@ -24,7 +24,7 @@ import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
  * Controls the Caption View that is shown at the bottom of the control and used
  * as a dynamic resource.
  */
-public class ContextualSearchCaptionControl extends OverlayPanelInflater
+public class ContextualSearchCaptionControl extends OverlayPanelTextViewInflater
         implements ChromeAnimation.Animatable<ContextualSearchCaptionControl.AnimationType> {
     private static final float ANIMATION_PERCENTAGE_ZERO = 0.f;
     private static final float ANIMATION_PERCENTAGE_COMPLETE = 1.f;
@@ -200,6 +200,26 @@ public class ContextualSearchCaptionControl extends OverlayPanelInflater
         return mAnimationPercentage;
     }
 
+    /**
+     * @return The text currently showing in the caption view.
+     */
+    public CharSequence getCaptionText() {
+        return mCaption.getText();
+    }
+
+    //========================================================================================
+    // OverlayPanelTextViewInflater overrides
+    //========================================================================================
+
+    @Override
+    protected TextView getTextView() {
+        return mCaption;
+    }
+
+    //========================================================================================
+    // OverlayPanelInflater overrides
+    //========================================================================================
+
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ -218,14 +238,6 @@ public class ContextualSearchCaptionControl extends OverlayPanelInflater
         if (!mShowingExpandedCaption) animateTransitionIn();
     }
 
-    /**
-     * @return The text currently showing in the caption view.
-     */
-    @VisibleForTesting
-    public CharSequence getCaptionText() {
-        return mCaption.getText();
-    }
-
     // ============================================================================================
     // Search Caption Animation
     // ============================================================================================