Relanding fix from ea9b0ba419a3598bdb7f7c62afdf4409afa73ab1

chrome/browser/ui/views/location_bar/location_bar_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 60 matching lines @@
                         public views::DragController,
                         public gfx::AnimationDelegate,
                         public ChromeOmniboxEditController,
                         public DropdownBarHostDelegate,
                         public TemplateURLServiceObserver,
                         public ui_zoom::ZoomEventManagerObserver {
  public:
   // The location bar view's class name.
   static const char kViewClassName[];
 
-  // Returns the offset used during dropdown animation.
-  int dropdown_animation_offset() const { return dropdown_animation_offset_; }
-
   class Delegate {
    public:
     // Should return the current web contents.
     virtual content::WebContents* GetWebContents() = 0;
 
     virtual ToolbarModel* GetToolbarModel() = 0;
     virtual const ToolbarModel* GetToolbarModel() const = 0;
 
     // Creates Widget for the given delegate.
     virtual views::Widget* CreateViewsBubble(
@@ skipping 287 matching lines @@
   void AnimationProgressed(const gfx::Animation* animation) override;
   void AnimationEnded(const gfx::Animation* animation) override;
 
   // ChromeOmniboxEditController:
   void OnChanged() override;
   void OnSetFocus() override;
   const ToolbarModel* GetToolbarModel() const override;
 
   // DropdownBarHostDelegate:
   void SetFocusAndSelection(bool select_all) override;
-  void SetAnimationOffset(int offset) override;
 
   // TemplateURLServiceObserver:
   void OnTemplateURLServiceChanged() override;
 
   // The Browser this LocationBarView is in.  Note that at least
   // chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser
   // window, so this may be NULL.
   Browser* browser_;
 
   OmniboxViewViews* omnibox_view_;
@@ skipping 65 matching lines @@
   // focused. Used when the toolbar is in full keyboard accessibility mode.
   bool show_focus_rect_;
 
   // This is in case we're destroyed before the model loads. We need to make
   // Add/RemoveObserver calls.
   TemplateURLService* template_url_service_;
 
   // Tracks this preference to determine whether bookmark editing is allowed.
   BooleanPrefMember edit_bookmarks_enabled_;
 
-  // During dropdown animation, the host clips the widget and draws only the
-  // bottom part of it. The view needs to know the pixel offset at which we are
-  // drawing the widget so that we can draw the curved edges that attach to the
-  // toolbar in the right location.
-  int dropdown_animation_offset_;
-
   // This is a debug state variable that stores if the WebContents was null
   // during the last RefreshPageAction.
   bool web_contents_null_at_last_refresh_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_