Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController.

chrome/browser/ui/views/find_bar_host.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/views/find_bar_host.h"
 
 #include <algorithm>
 
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
@@ skipping 282 matching lines @@
   if (!avoid_overlapping_rect.IsEmpty()) {
     // For comparison (with the Intersects function below) we need to account
     // for the fact that we draw the Find widget relative to the Chrome frame,
     // whereas the selection rect is relative to the page.
     GetWidgetPositionNative(&avoid_overlapping_rect);
   }
 
   gfx::Rect new_pos = FindBarController::GetLocationForFindbarView(
       view_location, widget_bounds, avoid_overlapping_rect);
 
+  // While we are animating, the Find window will grow bottoms up so we need to
+  // re-position the widget so that it appears to grow out of the toolbar.
+  if (animation_offset() > 0)
+    new_pos.Offset(0, std::min(0, -animation_offset()));
+
   return new_pos;
 }
 
 void FindBarHost::SetDialogPosition(const gfx::Rect& new_pos) {
-  DropdownBarHost::SetDialogPosition(new_pos);
-
   if (new_pos.IsEmpty())
     return;
 
+  if (!host()->IsVisible())
+    host()->Show();
+  host()->SetBounds(new_pos);
+
   // Tell the immersive mode controller about the find bar's new bounds. The
   // immersive mode controller uses the bounds to keep the top-of-window views
   // revealed when the mouse is hovered over the find bar.
   browser_view()->immersive_mode_controller()->OnFindBarVisibleBoundsChanged(
       host()->GetWindowBoundsInScreen());
 }
 
 void FindBarHost::GetWidgetBounds(gfx::Rect* bounds) {
   DCHECK(bounds);
   // The BrowserView does Layout for the components that we care about
@@ skipping 31 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // private:
 
 void FindBarHost::GetWidgetPositionNative(gfx::Rect* avoid_overlapping_rect) {
   gfx::Rect frame_rect = host()->GetTopLevelWidget()->GetWindowBoundsInScreen();
   gfx::Rect webcontents_rect =
       find_bar_controller_->web_contents()->GetViewBounds();
   avoid_overlapping_rect->Offset(0, webcontents_rect.y() - frame_rect.y());
 }