Remove OriginChip code.

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 21 matching lines @@
 class ContentSettingImageView;
 class EVBubbleView;
 class ExtensionAction;
 class GURL;
 class GeneratedCreditCardView;
 class InstantController;
 class KeywordHintView;
 class LocationIconView;
 class OpenPDFInReaderView;
 class ManagePasswordsIconView;
-class OriginChipView;
 class PageActionWithBadgeView;
 class PageActionImageView;
 class Profile;
 class SearchButton;
 class SelectedKeywordView;
 class StarView;
 class TemplateURLService;
 class TranslateIconView;
 class ZoomView;
 
 namespace content {
 struct SSLStatus;
 }
 
-namespace gfx {
-class SlideAnimation;
-}
-
 namespace views {
 class BubbleDelegateView;
 class ImageButton;
 class ImageView;
 class Label;
 class Widget;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // LocationBarView class
 //
 //   The LocationBarView class is a View subclass that paints the background
 //   of the URL bar strip and contains its content.
 //
 /////////////////////////////////////////////////////////////////////////////
 class LocationBarView : public LocationBar,
                         public LocationBarTesting,
                         public views::View,
                         public views::ButtonListener,
                         public views::DragController,
                         public OmniboxEditController,
                         public DropdownBarHostDelegate,
-                        public gfx::AnimationDelegate,
                         public TemplateURLServiceObserver,
                         public SearchModelObserver {
  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 {
@@ skipping 150 matching lines @@
 
   // views::View:
   bool HasFocus() const override;
   void GetAccessibleState(ui::AXViewState* state) override;
   gfx::Size GetPreferredSize() const override;
   void Layout() override;
 
   // OmniboxEditController:
   void Update(const content::WebContents* contents) override;
   void ShowURL() override;
-  void EndOriginChipAnimations(bool cancel_fade) override;
   ToolbarModel* GetToolbarModel() override;
   content::WebContents* GetWebContents() override;
 
   // Thickness of the edges of the omnibox background images, in normal mode.
   static const int kNormalEdgeThickness;
   // The same, but for popup mode.
   static const int kPopupEdgeThickness;
   // Space between items in the location bar, as well as between items and the
   // edges.
   static const int kItemPadding;
   // Amount of padding built into the standard omnibox icons.
   static const int kIconInternalPadding;
-  // Amount of padding to place between the origin chip and the leading edge of
-  // the location bar.
-  static const int kOriginChipEdgeItemPadding;
-  // Amount of padding built into the origin chip.
-  static const int kOriginChipBuiltinPadding;
   // Space between the edge and a bubble.
   static const int kBubblePadding;
 
  private:
   typedef std::vector<ContentSettingImageView*> ContentSettingViews;
 
   friend class PageActionImageView;
   friend class PageActionWithBadgeView;
   typedef std::vector<ExtensionAction*> PageActions;
   typedef std::vector<PageActionWithBadgeView*> PageActionViews;
@@ skipping 45 matching lines @@
   // Used to "reverse" the URL showing/hiding animations, since we use separate
   // animations whose curves are not true inverses of each other.  Based on the
   // current position of the omnibox, calculates what value the desired
   // animation (|hide_url_animation_| if |hide| is true, |show_url_animation_|
   // if it's false) should be set to in order to produce the same omnibox
   // position.  This way we can stop the old animation, set the new animation to
   // this value, and start it running, and the text will appear to reverse
   // directions from its current location.
   double GetValueForAnimation(bool hide) const;
 
-  // Resets |show_url_animation_| and the color changes it causes.
-  void ResetShowAnimationAndColors();
-
   // LocationBar:
   void ShowFirstRunBubble() override;
   GURL GetDestinationURL() const override;
   WindowOpenDisposition GetWindowOpenDisposition() const override;
   ui::PageTransition GetPageTransition() const override;
   void AcceptInput() override;
   void FocusSearch() override;
   void UpdateContentSettingsIcons() override;
   void UpdateManagePasswordsIconAndBubble() override;
   void UpdatePageActions() override;
@@ skipping 33 matching lines @@
   int GetDragOperationsForView(View* sender, const gfx::Point& p) override;
   bool CanStartDragForView(View* sender,
                            const gfx::Point& press_pt,
                            const gfx::Point& p) override;
 
   // OmniboxEditController:
   void OnChanged() override;
   void OnSetFocus() override;
   InstantController* GetInstant() override;
   const ToolbarModel* GetToolbarModel() const override;
-  void HideURL() override;
 
   // DropdownBarHostDelegate:
   void SetFocusAndSelection(bool select_all) override;
   void SetAnimationOffset(int offset) override;
 
-  // gfx::AnimationDelegate:
-  void AnimationProgressed(const gfx::Animation* animation) override;
-  void AnimationEnded(const gfx::Animation* animation) override;
-
   // TemplateURLServiceObserver:
   void OnTemplateURLServiceChanged() override;
 
   // SearchModelObserver:
   void ModelChanged(const SearchModel::State& old_state,
                     const SearchModel::State& new_state) 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_;
 
   // Our delegate.
   Delegate* delegate_;
 
   // Object used to paint the border.
   scoped_ptr<views::Painter> border_painter_;
 
-  // The origin chip that may appear in the location bar.
-  OriginChipView* origin_chip_view_;
-
   // An icon to the left of the edit field.
   LocationIconView* location_icon_view_;
 
   // A bubble displayed for EV HTTPS sites.
   EVBubbleView* ev_bubble_view_;
 
   // A view to show inline autocompletion when an IME is active.  In this case,
   // we shouldn't change the text or selection inside the OmniboxView itself,
   // since this will conflict with the IME's control over the text.  So instead
   // we show any autocompletion in a separate field after the OmniboxView.
@@ skipping 62 matching lines @@
 
   // 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_;
 
-  // Origin chip animations.
-  //
-  // For the "show URL" animation, we instantly hide the origin chip and show
-  // the |omnibox_view_| in its place, containing the complete URL.  However, we
-  // clip that view (using the XXX_leading_inset_ and XXX_width_ members) so
-  // that only the hostname is visible.  We also offset the omnibox (using the
-  // XXX_offset_ members) so the hostname is in the same place as it was in the
-  // origin chip.  Finally, we set the selection text and background color of
-  // the text to match the pressed origin chip.  Then, as the animation runs,
-  // all of these values are animated to their steady-state values (no omnibox
-  // offset, no inset, width equal to the full omnibox text [which is reset to
-  // "no width clamp" after the animation ends], and standard selection colors).
-  //
-  // For the hide animation, we run the positioning and clipping parts of the
-  // animation in reverse, but instead of changing the selection color, because
-  // there usually isn't a selection when hiding, we leave the omnibox colors
-  // alone, and when the hide animation has ended, tell the origin chip to
-  // fade-in its background.
-  scoped_ptr<gfx::SlideAnimation> show_url_animation_;
-  scoped_ptr<gfx::SlideAnimation> hide_url_animation_;
-  // The omnibox offset may be positive or negative.  The starting offset is the
-  // amount necessary to shift the |omnibox_view_| by such that the hostname
-  // portion of the URL aligns with the hostname in the origin chip.  As the
-  // show animation runs, the current offset gradually moves to 0.
-  int starting_omnibox_offset_;
-  int current_omnibox_offset_;
   // The leading inset is always positive.  The starting inset is the width of
   // the text between the leading edge of the omnibox and the edge of the
   // hostname, which is clipped off at the start of the show animation.  Note
   // that in RTL mode, this will be the part of the URL that is logically after
   // the hostname.  As the show animation runs, the current inset gradually
   // moves to 0.
   int starting_omnibox_leading_inset_;

[Justin Donnelly, 2014/11/21 19:15:24]

These properties are no longer used.

   int current_omnibox_leading_inset_;
-  // The width is always positive.  The ending width is the width of the entire
-  // omnibox URL.  As the show animation runs, the current width gradually moves
-  // from the width of the hostname to the ending value.
-  int current_omnibox_width_;
-  int ending_omnibox_width_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_