Relanding fix from ea9b0ba419a3598bdb7f7c62afdf4409afa73ab1

chrome/browser/ui/views/dropdown_bar_view.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/dropdown_bar_view.h"
 
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
-// When we are animating, we draw only the top part of the left and right
-// edges to give the illusion that the find dialog is attached to the
-// window during this animation; this is the height of the items we draw.
-const int kAnimatingEdgeHeight = 5;
-
 // Background to paint toolbar background with rounded corners.
 class DropdownBackground : public views::Background {
  public:
   explicit DropdownBackground(BrowserView* browser,
                               const gfx::ImageSkia* left_alpha_mask,
                               const gfx::ImageSkia* right_alpha_mask);
   ~DropdownBackground() override {}
 
   // Overridden from views::Background.
   void Paint(gfx::Canvas* canvas, views::View* view) const override;
@@ skipping 42 matching lines @@
       0, 0, left_edge_width, height, false, paint);
 
   // Draw right edge.
   int x_right_edge = view->bounds().width() - right_edge_width;
   canvas->DrawImageInt(*right_alpha_mask_, 0, 0, right_edge_width,
       mask_height, x_right_edge, 0, right_edge_width, height, false, paint);
 }
 
 }  // namespace
 
-DropdownBarView::DropdownBarView(DropdownBarHost* host)
-    : host_(host), animation_offset_(0) {}
+DropdownBarView::DropdownBarView(DropdownBarHost* host) : host_(host) {}
 
 DropdownBarView::~DropdownBarView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// DropDownBarView, public:
-
-void DropdownBarView::SetAnimationOffset(int offset) {
-  animation_offset_ = offset;
-  set_clip_insets(gfx::Insets(animation_offset_, 0, 0, 0));
-}
-
-// DropDownBarView, views::View overrides:
-void DropdownBarView::OnPaint(gfx::Canvas* canvas) {
-  OnPaintBackground(canvas);
-  OnPaintBorder(canvas);
-
-  if (animation_offset() > 0) {
-    gfx::Canvas animating_edges(
-        gfx::Size(bounds().width(), kAnimatingEdgeHeight),
-        canvas->image_scale(), false);
-    canvas->Translate(bounds().OffsetFromOrigin());
-    OnPaintBackground(&animating_edges);
-    OnPaintBorder(&animating_edges);
-    canvas->DrawImageInt(gfx::ImageSkia(animating_edges.ExtractImageRep()),
-                         bounds().x(), animation_offset());
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // DropDownBarView, protected:
 
 void DropdownBarView::SetBackground(const gfx::ImageSkia* left_alpha_mask,
                                     const gfx::ImageSkia* right_alpha_mask) {
   set_background(new DropdownBackground(host()->browser_view(), left_alpha_mask,
       right_alpha_mask));
 }
 
 void DropdownBarView::SetBorderFromIds(int left_border_image_id,
                                        int middle_border_image_id,
                                        int right_border_image_id) {
   int border_image_ids[3] = {left_border_image_id, middle_border_image_id,
       right_border_image_id};
   SetBorder(views::Border::CreateBorderPainter(
       new views::HorizontalPainter(border_image_ids), gfx::Insets()));
 }