New animation for the origin chip URL showing/hiding.

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 238 matching lines @@
 
   // views::View:
   virtual bool HasFocus() const OVERRIDE;
   virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual void Layout() OVERRIDE;
 
   // OmniboxEditController:
   virtual void Update(const content::WebContents* contents) OVERRIDE;
   virtual void ShowURL() OVERRIDE;
+  virtual void EndOriginChipAnimations() OVERRIDE;
   virtual ToolbarModel* GetToolbarModel() OVERRIDE;
   virtual 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;
@@ skipping 60 matching lines @@
   // using an accessibility API (typically automation software, screen readers
   // don't normally use this). Sets the value and clears the selection.
   void AccessibilitySetValue(const base::string16& new_value);
 
   // Returns true if the suggest text is valid.
   bool HasValidSuggestText() const;
 
   bool ShouldShowKeywordBubble() const;
   bool ShouldShowEVBubble() const;
 
-  // Origin chip animation control methods.
-  void OnShowURLAnimationEnded();
-  void OnHideURLAnimationEnded();
+  // 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;

[Justin Donnelly, 2014/05/29 21:37:29]

How about GetPositionForAnimation to be more specific?

[Peter Kasting, 2014/05/29 23:32:16]

That wouldn't be correct.  Because the animations are nonlinear, their value and
the resulting position are not the same.  This returns a value rather than a
position.

[Justin Donnelly, 2014/06/02 15:07:33]

Ah, yeah, my bad.  I made this comment before I really understood what it was
doing.

+
+  // Resets |show_url_animation_| and the color changes it causes.
+  void ResetShowAnimationAndColors();
 
   // LocationBar:
   virtual void ShowFirstRunBubble() OVERRIDE;
   virtual GURL GetDestinationURL() const OVERRIDE;
   virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
   virtual content::PageTransition GetPageTransition() const OVERRIDE;
   virtual void AcceptInput() OVERRIDE;
   virtual void FocusSearch() OVERRIDE;
   virtual void UpdateContentSettingsIcons() OVERRIDE;
   virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE;
@@ skipping 155 matching lines @@
 
   // 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.
   scoped_ptr<gfx::SlideAnimation> show_url_animation_;
   scoped_ptr<gfx::SlideAnimation> hide_url_animation_;
-
-  // Text label shown only during origin chip animations.
-  views::Label* animated_host_label_;
+  int current_omnibox_offset_;
+  int starting_omnibox_offset_;
+  int current_omnibox_leading_inset_;
+  int starting_omnibox_leading_inset_;
+  int current_omnibox_width_;
+  int ending_omnibox_width_;
 
   // Used to register for notifications received by NotificationObserver.
   content::NotificationRegistrar registrar_;
 
   // Used to bind callback functions to this object.
   base::WeakPtrFactory<LocationBarView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_