New animation for the origin chip URL showing/hiding.

chrome/browser/ui/views/location_bar/location_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/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
-#include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar_util.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
 #include "chrome/browser/ui/passwords/manage_passwords_icon.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/toolbar/origin_chip_info.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/generated_credit_card_view.h"
 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_layout.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h"
 #include "chrome/browser/ui/views/location_bar/origin_chip_view.h"
@@ skipping 21 matching lines @@
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/label.h"
@@ skipping 121 matching lines @@
       generated_credit_card_view_(NULL),
       open_pdf_in_reader_view_(NULL),
       manage_passwords_icon_view_(NULL),
       translate_icon_view_(NULL),
       star_view_(NULL),
       search_button_(NULL),
       is_popup_mode_(is_popup_mode),
       show_focus_rect_(false),
       template_url_service_(NULL),
       dropdown_animation_offset_(0),
-      animated_host_label_(NULL),
+      current_omnibox_offset_(0),
+      starting_omnibox_offset_(0),
+      current_omnibox_leading_inset_(0),
+      starting_omnibox_leading_inset_(0),
+      current_omnibox_width_(0),
+      ending_omnibox_width_(0),
       weak_ptr_factory_(this) {
   edit_bookmarks_enabled_.Init(
       prefs::kEditBookmarksEnabled, profile->GetPrefs(),
       base::Bind(&LocationBarView::Update, base::Unretained(this),
                  static_cast<content::WebContents*>(NULL)));
 
   if (browser_)
     browser_->search_model()->AddObserver(this);
 }
 
@@ skipping 71 matching lines @@
   ime_inline_autocomplete_view_->SetAutoColorReadabilityEnabled(false);
   ime_inline_autocomplete_view_->set_background(
       views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused)));
   ime_inline_autocomplete_view_->SetEnabledColor(
       GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldSelectionColor));
   ime_inline_autocomplete_view_->SetVisible(false);
   AddChildView(ime_inline_autocomplete_view_);
 
-  animated_host_label_ = new views::Label(base::string16(), font_list);
-  animated_host_label_->SetVisible(false);
-  AddChildView(animated_host_label_);
-
   origin_chip_view_ = new OriginChipView(this, profile(), font_list);
   origin_chip_view_->SetFocusable(false);
   origin_chip_view_->set_drag_controller(this);
   AddChildView(origin_chip_view_);
 
   const SkColor text_color = GetColor(ToolbarModel::NONE, TEXT);
   selected_keyword_view_ = new SelectedKeywordView(
       bubble_font_list, text_color, background_color, profile());
   AddChildView(selected_keyword_view_);
 
@@ skipping 84 matching lines @@
   search_button_border->SetPainter(true, views::Button::STATE_HOVERED, NULL);
   search_button_border->SetPainter(true, views::Button::STATE_PRESSED, NULL);
   search_button_border->SetPainter(true, views::Button::STATE_DISABLED, NULL);
   search_button_->SetBorder(search_button_border.PassAs<views::Border>());
   const int kSearchButtonWidth = 56;
   search_button_->set_min_size(gfx::Size(kSearchButtonWidth, 0));
   search_button_->SetVisible(false);
   AddChildView(search_button_);
 
   show_url_animation_.reset(new gfx::SlideAnimation(this));
-  show_url_animation_->SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
+  show_url_animation_->SetTweenType(gfx::Tween::LINEAR_OUT_SLOW_IN);
   show_url_animation_->SetSlideDuration(200);
 
   hide_url_animation_.reset(new gfx::SlideAnimation(this));
-  hide_url_animation_->SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
-  hide_url_animation_->SetSlideDuration(200);
+  hide_url_animation_->SetTweenType(gfx::Tween::FAST_OUT_LINEAR_IN);
+  hide_url_animation_->SetSlideDuration(175);
 
   content::Source<Profile> profile_source = content::Source<Profile>(profile());
   registrar_.Add(this,
                  chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED,
                  profile_source);
   registrar_.Add(
       this, chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, profile_source);
   registrar_.Add(this,
                  chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
                  profile_source);
@@ skipping 108 matching lines @@
   if (star_view_)
     star_view_->SetToggled(on);
 }
 
 void LocationBarView::SetTranslateIconToggled(bool on) {
   translate_icon_view_->SetToggled(on);
 }
 
 gfx::Point LocationBarView::GetOmniboxViewOrigin() const {
   gfx::Point origin(omnibox_view_->bounds().origin());
-  // If the UI layout is RTL, the coordinate system is not transformed and
-  // therefore we need to adjust the X coordinate so that bubble appears on the
-  // right hand side of the location bar.
-  if (base::i18n::IsRTL())
-    origin.set_x(width() - origin.x());
+  origin.set_x(GetMirroredXInView(origin.x() - current_omnibox_offset_));
   views::View::ConvertPointToScreen(this, &origin);
   return origin;
 }
 
 void LocationBarView::SetImeInlineAutocompletion(const base::string16& text) {
   ime_inline_autocomplete_view_->SetText(text);
   ime_inline_autocomplete_view_->SetVisible(!text.empty());
 }
 
 void LocationBarView::SetGrayTextAutocompletion(const base::string16& text) {
   if (suggested_text_view_->text() != text) {
     suggested_text_view_->SetText(text);
     suggested_text_view_->SetVisible(!text.empty());
     Layout();
     SchedulePaint();
   }
 }
 
 base::string16 LocationBarView::GetGrayTextAutocompletion() const {
-  return HasValidSuggestText() ? suggested_text_view_->text()
-                               : base::string16();
+  return HasValidSuggestText() ?
+      suggested_text_view_->text() : base::string16();
 }
 
 void LocationBarView::SetShowFocusRect(bool show) {
   show_focus_rect_ = show;
   SchedulePaint();
 }
 
 void LocationBarView::SelectAll() {
   omnibox_view_->SelectAll(true);
 }
@@ skipping 134 matching lines @@
 
   min_size.set_width(
       leading_width + omnibox_view_->GetMinimumSize().width() + trailing_width);
   return min_size;
 }
 
 void LocationBarView::Layout() {
   if (!IsInitialized())
     return;
 
-  animated_host_label_->SetVisible(false);
   origin_chip_view_->SetVisible(GetToolbarModel()->ShouldShowOriginChip());
   selected_keyword_view_->SetVisible(false);
   location_icon_view_->SetVisible(false);
   ev_bubble_view_->SetVisible(false);
   keyword_hint_view_->SetVisible(false);
 
   LocationBarLayout leading_decorations(
       LocationBarLayout::LEFT_EDGE,
       kItemPadding - GetEditLeadingInternalSpace());
   LocationBarLayout trailing_decorations(LocationBarLayout::RIGHT_EDGE,
                                          kItemPadding);
 
-  // Show and position the animated host label used in the show and hide URL
-  // animations.
-  if (show_url_animation_->is_animating() ||
-      hide_url_animation_->is_animating()) {
-    WebContents* web_contents = GetWebContents();
-    const GURL url = web_contents ? web_contents->GetURL() : GURL();
-    const base::string16 host =
-        OriginChip::LabelFromURLForProfile(url, profile());
-    animated_host_label_->SetText(host);
-
-    const base::string16 formatted_url = GetToolbarModel()->GetFormattedURL();
-
-    // Split the formatted URL on the host name in order to determine the size
-    // of the text leading up to it.
-    std::vector<base::string16> substrings;
-    base::SplitStringUsingSubstr(formatted_url, host, &substrings);
-    const base::string16 text_leading_host = substrings[0];
-    const int leading_text_width =
-        gfx::Canvas::GetStringWidth(text_leading_host,
-                                    origin_chip_view_->GetFontList());
-
-    const int position_of_host_name_in_chip = origin_chip_view_->host_label_x();
-    const int position_of_host_name_in_url =
-        position_of_host_name_in_chip + leading_text_width;
-
-    int host_label_x = position_of_host_name_in_chip;
-    if (show_url_animation_->is_animating()) {
-      host_label_x = show_url_animation_->
-          CurrentValueBetween(position_of_host_name_in_chip,
-                              position_of_host_name_in_url);
-    } else if (hide_url_animation_->is_animating()) {
-      host_label_x = hide_url_animation_->
-          CurrentValueBetween(position_of_host_name_in_url,
-                              position_of_host_name_in_chip);
-    }
-    animated_host_label_->SetBounds(
-        host_label_x, 0,
-        animated_host_label_->GetPreferredSize().width(), height());
-    animated_host_label_->SetVisible(true);
-  }
-
-  const int origin_chip_width = origin_chip_view_->visible() ?
-      origin_chip_view_->GetPreferredSize().width() : 0;
-  origin_chip_view_->SetBounds(0, 0, origin_chip_width, height());
+  const int origin_chip_preferred_width =
+      origin_chip_view_->GetPreferredSize().width();
+  const int origin_chip_width =
+      origin_chip_view_->visible() ? origin_chip_preferred_width : 0;
+  // Always give the origin chip view its desired size and lay it out, even when
+  // it's not visible, so we can calculate the correct animation values below
+  // when switching to tabs that have the origin chip hidden.
+  origin_chip_view_->SetBounds(0, 0, origin_chip_preferred_width, height());
+  origin_chip_view_->Layout();
 
   const int bubble_location_y = vertical_edge_thickness() + kBubblePadding;
   const base::string16 keyword(omnibox_view_->model()->keyword());
   // In some cases (e.g. fullscreen mode) we may have 0 height.  We still want
   // to position our child views in this case, because other things may be
   // positioned relative to them (e.g. the "bookmark added" bubble if the user
   // hits ctrl-d).
   const int location_height = GetInternalHeight(false);
   const int bubble_height = std::max(location_height - (kBubblePadding * 2), 0);
   if (ShouldShowKeywordBubble()) {
@@ skipping 104 matching lines @@
 
   int location_needed_width = omnibox_view_->GetTextWidth();
   int available_width = entry_width - location_needed_width;
   // The bounds must be wide enough for all the decorations to fit.
   gfx::Rect location_bounds(
       origin_chip_width + horizontal_edge_thickness, vertical_edge_thickness(),
       std::max(full_width, full_width - entry_width), location_height);
   leading_decorations.LayoutPass3(&location_bounds, &available_width);
   trailing_decorations.LayoutPass3(&location_bounds, &available_width);
 
+  // Calculate the target omnibox offset.  We have to do this in Layout, after

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

It took me a pretty good while to understand this new block of code. I think the
issue is that there's no high-level description of how each of the elements
(offset, inset and width) are combined to produce the animation.  Can you add an
overview (either here or where the new properties are declared) that explains
what the animation looks like and how the three values are used to do the
clipping and the movement?

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

Done.

+  // |origin_chip_view_| is laid out, because this may affect the host label
+  // offset in the origin chip.
+  const base::string16& chip_text(origin_chip_view_->host_label_text());
+  // If the chip is clicked, the omnibox text will become the toolbar model's
+  // formatted URL.  We can't ask the omnibox for its current text, because
+  // while the chip is visible the current text is empty.
+  const base::string16& omnibox_text(GetToolbarModel()->GetFormattedURL());
+  size_t chip_text_offset = omnibox_text.find(chip_text);
+  const gfx::FontList& font_list = omnibox_view_->GetFontList();
+  const int chip_text_width = gfx::GetStringWidth(chip_text, font_list);
+  const int old_starting_offset = starting_omnibox_offset_;
+  const int old_starting_leading_inset = starting_omnibox_leading_inset_;
+  const int old_ending_width = ending_omnibox_width_;
+  starting_omnibox_offset_ = current_omnibox_offset_ = 0;
+  starting_omnibox_leading_inset_ = current_omnibox_leading_inset_ = 0;
+  ending_omnibox_width_ = current_omnibox_width_ = chip_text_width;
+  if (chip_text_offset < omnibox_text.length()) {
+    if (base::i18n::IsRTL())
+      chip_text_offset += chip_text.length();
+    base::string16 extra_omnibox_text(base::i18n::IsRTL() ?
+        omnibox_text.substr(chip_text_offset) :
+        omnibox_text.substr(0, chip_text_offset));
+    starting_omnibox_leading_inset_ =
+        gfx::GetStringWidth(extra_omnibox_text, font_list);
+    starting_omnibox_offset_ = origin_chip_view_->HostLabelOffset() -
+        starting_omnibox_leading_inset_;
+    ending_omnibox_width_ = gfx::GetStringWidth(omnibox_text, font_list);
+  }
+
+  // End the animations immediately if the parameters have changed.
+  if ((starting_omnibox_offset_ != old_starting_offset) ||
+      (starting_omnibox_leading_inset_ != old_starting_leading_inset) ||
+      (ending_omnibox_width_ != old_ending_width))
+    EndOriginChipAnimations();
+
+  // Also end the animations immediately if there's nothing to animate.
+  const ui::NativeTheme* native_theme = GetNativeTheme();
+  const SkColor ending_selection_text_color = native_theme->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldSelectionColor);
+  const SkColor ending_selection_background_color =
+      native_theme->GetSystemColor(
+          ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused);
+  if ((starting_omnibox_offset_ == 0) &&
+      (starting_omnibox_leading_inset_ == 0) &&
+      (ending_omnibox_width_ == chip_text_width) &&
+      (hide_url_animation_->is_animating() ||
+       ((ending_selection_text_color ==
+            origin_chip_view_->pressed_text_color()) &&
+        (ending_selection_background_color ==
+            origin_chip_view_->pressed_background_color()))))
+    EndOriginChipAnimations();
+
+  if (show_url_animation_->is_animating()) {
+    omnibox_view_->SetSelectionTextColor(gfx::Tween::ColorValueBetween(
+        show_url_animation_->GetCurrentValue(),
+        origin_chip_view_->pressed_text_color(),
+        ending_selection_text_color));
+    omnibox_view_->SetSelectionBackgroundColor(gfx::Tween::ColorValueBetween(
+        show_url_animation_->GetCurrentValue(),
+        origin_chip_view_->pressed_background_color(),
+        ending_selection_background_color));
+    current_omnibox_offset_ =
+        show_url_animation_->CurrentValueBetween(starting_omnibox_offset_, 0);
+    current_omnibox_leading_inset_ = show_url_animation_->CurrentValueBetween(
+        starting_omnibox_leading_inset_, 0);
+    current_omnibox_width_ = show_url_animation_->CurrentValueBetween(
+        chip_text_width, ending_omnibox_width_);
+  } else if (hide_url_animation_->is_animating()) {
+    current_omnibox_offset_ =
+        hide_url_animation_->CurrentValueBetween(0, starting_omnibox_offset_);
+    current_omnibox_leading_inset_ = hide_url_animation_->CurrentValueBetween(
+        0, starting_omnibox_leading_inset_);
+    current_omnibox_width_ = hide_url_animation_->CurrentValueBetween(
+        ending_omnibox_width_, chip_text_width);
+  }
+  // Contract |available_width| is necessary, but never expand it.  This way,

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

s/is necessary/as necessary/

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

Done.

+  // we'll never draw suggested text at first and then have it disappear
+  // midway through the animation.
+  if (current_omnibox_offset_ > 0)
+    available_width -= current_omnibox_offset_;
+  location_bounds.Inset(current_omnibox_offset_, 0, 0, 0);
+
   // Layout out the suggested text view right aligned to the location
   // entry. Only show the suggested text if we can fit the text from one
   // character before the end of the selection to the end of the text and the
   // suggested text. If we can't it means either the suggested text is too big,
   // or the user has scrolled.
 
   // TODO(sky): We could potentially adjust this to take into account suggested
   // text to force using minimum size if necessary, but currently the chance of
   // showing keyword hints and suggested text is minimal and we're not confident
   // this is the right approach for suggested text.
@@ skipping 99 matching lines @@
 
   if (contents)
     omnibox_view_->OnTabChanged(contents);
   else
     omnibox_view_->Update();
 
   OnChanged();  // NOTE: Calls Layout().
 }
 
 void LocationBarView::ShowURL() {
+  // Start the animation before calling ShowURL(), since the latter eventually
+  // calls back to Layout(), and if the animation is not marked as "running",
+  // we'll draw the omnibox in its final position briefly until the first
+  // animation callback reaches us.
   if (chrome::ShouldDisplayOriginChip()) {
-    omnibox_view_->SetVisible(false);
-    omnibox_view_->ShowURL();
-    show_url_animation_->Show();
-  } else {
-    omnibox_view_->ShowURL();
+    if (hide_url_animation_->is_animating()) {
+      const double show_value = GetValueForAnimation(false);
+      hide_url_animation_->Reset();
+      show_url_animation_->Show();
+      // This must be done after calling Show() and is not equivalent to
+      // Reset(n).

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

Can you add a note as to how it's not equivalent?

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

Done.

+      show_url_animation_->SetCurrentValue(show_value);
+    } else {
+      show_url_animation_->Show();
+    }
   }
+  omnibox_view_->ShowURL();
+}
+
+void LocationBarView::EndOriginChipAnimations() {
+  show_url_animation_->End();
+  hide_url_animation_->End();
+  origin_chip_view_->CancelFade();
 }
 
 ToolbarModel* LocationBarView::GetToolbarModel() {
   return delegate_->GetToolbarModel();
 }
 
 WebContents* LocationBarView::GetWebContents() {
   return delegate_->GetWebContents();
 }
 
@@ skipping 177 matching lines @@
 bool LocationBarView::ShouldShowKeywordBubble() const {
   return !omnibox_view_->model()->keyword().empty() &&
       !omnibox_view_->model()->is_keyword_hint();
 }
 
 bool LocationBarView::ShouldShowEVBubble() const {
   return !chrome::ShouldDisplayOriginChip() &&
       (GetToolbarModel()->GetSecurityLevel(false) == ToolbarModel::EV_SECURE);
 }
 
-void LocationBarView::OnShowURLAnimationEnded() {
-  animated_host_label_->SetVisible(false);
-  omnibox_view_->SetVisible(true);
-  omnibox_view_->FadeIn();
-  omnibox_view_->SetFocus();
-
-  // Sometimes the selection established by OmniboxView::ShowURL() is lost at
-  // the call to SetFocus() above.  Select all again to be sure.
-  // TODO(jdonnelly): Figure out why the selection is sometimes lost and
-  // implement a more principled fix.
-  omnibox_view_->SelectAll(true);
+double LocationBarView::GetValueForAnimation(bool hide) const {
+  int calculated_offset;
+  const gfx::Tween::Type tween_type =
+      hide ? gfx::Tween::FAST_OUT_LINEAR_IN : gfx::Tween::LINEAR_OUT_SLOW_IN;

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

These should probably be constants in this file to ensure that any change here
is applied to the animation initialization and vice versa (e.g.
SHOW_URL_TWEEN_TYPE and HIDE_URL_TWEEN_TYPE).

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

Done.

+  int start_offset = starting_omnibox_offset_, end_offset = 0;
+  if (hide)
+    std::swap(start_offset, end_offset);
+  const int desired_offset = abs(current_omnibox_offset_);
+  // Binary-search the value space (0 <= value <= 1) to find the appropriate
+  // position.  We only bother to iterate to within 1/64 of the desired value,
+  // because the longer of the two animations will only run for twelve frames
+  // anyway (200 ms * 60 Hz), so at this point we'll have a maximum error of
+  // less than a fifth of an animation frame, which the user isn't going to
+  // notice.
+  //
+  // We have to use this method because Tween::CalculateValue() is not
+  // necessarily easily invertible.  Luckily, this only runs when the user
+  // reverses the animation (rare), and the limit on how many iterations we'll
+  // do ensures the cost is unnoticeable.
+  double value = 0.5;
+  double step = value / 2;
+  do {
+    calculated_offset = abs(gfx::Tween::IntValueBetween(
+        gfx::Tween::CalculateValue(tween_type, value), start_offset,
+        end_offset));
+    if (calculated_offset < desired_offset)
+      value += step;
+    else if (calculated_offset > desired_offset)
+      value -= step;
+    step /= 2;
+  } while ((calculated_offset != desired_offset) && (step >= (1.0 / 64)));
+  return value;
 }
 
-void LocationBarView::OnHideURLAnimationEnded() {
-  animated_host_label_->SetVisible(false);
-  omnibox_view_->HideURL();
-  omnibox_view_->SetVisible(true);
-  origin_chip_view_->FadeIn();
+void LocationBarView::ResetShowAnimationAndColors() {
+  show_url_animation_->Reset();
+  omnibox_view_->UseDefaultSelectionTextColor();
+  omnibox_view_->UseDefaultSelectionBackgroundColor();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private LocationBar implementation:
 
 void LocationBarView::ShowFirstRunBubble() {
   // Wait until search engines have loaded to show the first run bubble.
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   if (!url_service->loaded()) {
@@ skipping 74 matching lines @@
   SchedulePaint();
 }
 
 void LocationBarView::UpdateGeneratedCreditCardView() {
   generated_credit_card_view_->Update();
   Layout();
   SchedulePaint();
 }
 
 void LocationBarView::SaveStateToContents(WebContents* contents) {
+  // If we're about to switch tabs, complete any current animations, so that if
+  // the user is in the midst of hiding the URL, when he returns to this tab,
+  // the URL will be hidden rather than shown.
+  // NOTE: This must be called before SaveStateToTab().
+  EndOriginChipAnimations();
   omnibox_view_->SaveStateToTab(contents);
 }
 
 const OmniboxView* LocationBarView::GetOmniboxView() const {
   return omnibox_view_;
 }
 
 LocationBarTesting* LocationBarView::GetLocationBarForTesting() {
   return this;
 }
@@ skipping 92 matching lines @@
     const int kBorderCornerRadius = 2;
     canvas->DrawRoundRect(bounds, kBorderCornerRadius, paint);
   }
 
   // The border itself will be drawn in PaintChildren() since it includes an
   // inner shadow which should be drawn over the contents.
 }
 
 void LocationBarView::PaintChildren(gfx::Canvas* canvas,
                                     const views::CullSet& cull_set) {
-  // Paint all the children except for the origin chip and the search button,
+  // Paint all the children except for the omnibox itself, which may need to be
+  // clipped if it's animating in, and the origin chip and the search button,
   // which will be painted after the border.
   for (int i = 0, count = child_count(); i < count; ++i) {
-    if (!child_at(i)->layer() &&
-        (child_at(i) != origin_chip_view_) &&
-        (child_at(i) != search_button_))
-      child_at(i)->Paint(canvas, cull_set);
+    views::View* child = child_at(i);
+    if (!child->layer() && (child != omnibox_view_) &&
+        (child != origin_chip_view_) && (child != search_button_))
+      child->Paint(canvas, cull_set);
+  }
+
+  {
+    gfx::ScopedCanvas scoped_canvas(canvas);
+    if (show_url_animation_->is_animating() ||
+        hide_url_animation_->is_animating()) {
+      gfx::Rect clip_rect(omnibox_view_->bounds());
+      clip_rect.Inset(current_omnibox_leading_inset_, 0, 0, 0);
+      clip_rect.set_width(current_omnibox_width_);
+      clip_rect.set_x(GetMirroredXForRect(clip_rect));
+      canvas->ClipRect(clip_rect);
+    }
+    omnibox_view_->Paint(canvas, cull_set);
   }
 
   // For non-InstantExtendedAPI cases, if necessary, show focus rect. As we need
   // the focus rect to appear on top of children we paint here rather than
   // OnPaint().
   // Note: |Canvas::DrawFocusRect| paints a dashed rect with gray color.
   if (show_focus_rect_ && HasFocus())
     canvas->DrawFocusRect(omnibox_view_->bounds());
 
   // Maximized popup windows don't draw the horizontal edges.  We implement this
@@ skipping 79 matching lines @@
       ((conditions != chrome::DISPLAY_SEARCH_BUTTON_NEVER) &&
        (toolbar_model->WouldPerformSearchTermReplacement(true) ||
         ((conditions == chrome::DISPLAY_SEARCH_BUTTON_FOR_STR_OR_IIP) &&
          toolbar_model->input_in_progress())));
   search_button_->SetVisible(!is_popup_mode_ && meets_conditions);
   search_button_->SetImage(
       views::Button::STATE_NORMAL,
       *GetThemeProvider()->GetImageSkiaNamed((icon_id == IDR_OMNIBOX_SEARCH) ?
           IDR_OMNIBOX_SEARCH_BUTTON_LOUPE : IDR_OMNIBOX_SEARCH_BUTTON_ARROW));
 
-  if (origin_chip_view_->visible())
-    origin_chip_view_->OnChanged();
+  origin_chip_view_->OnChanged();
 
   Layout();
   SchedulePaint();
 }
 
 void LocationBarView::OnSetFocus() {
   GetFocusManager()->SetFocusedView(this);
 }
 
 InstantController* LocationBarView::GetInstant() {
   return delegate_->GetInstant();
 }
 
 const ToolbarModel* LocationBarView::GetToolbarModel() const {
   return delegate_->GetToolbarModel();
 }
 
 void LocationBarView::HideURL() {

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

Currently this method is only called if the origin chip is enabled.  But to be
safe from future refactorings, I think we ought to add a gate on
chrome::ShouldDisplayOriginChip.

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

I'm not keen on conditionals that should never be violated, so I added a DCHECK
instead.

-  omnibox_view_->SetVisible(false);
-  hide_url_animation_->Show();
+  if (show_url_animation_->is_animating()) {
+    const double hide_value = GetValueForAnimation(true);
+    ResetShowAnimationAndColors();
+    hide_url_animation_->Show();
+    // This must be done after calling Show() and is not equivalent to Reset(n).
+    hide_url_animation_->SetCurrentValue(hide_value);
+  } else {
+    hide_url_animation_->Show();
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private DropdownBarHostDelegate implementation:
 
 void LocationBarView::SetFocusAndSelection(bool select_all) {
   FocusLocation(select_all);
 }
 
 void LocationBarView::SetAnimationOffset(int offset) {
   dropdown_animation_offset_ = offset;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private gfx::AnimationDelegate implementation:
 
 void LocationBarView::AnimationProgressed(const gfx::Animation* animation) {
-  if (animation == show_url_animation_.get() ||
-      animation == hide_url_animation_.get()) {
-    Layout();
-    SchedulePaint();
-  }
+  DCHECK((animation == show_url_animation_.get()) ||
+      (animation == hide_url_animation_.get()));
+  Layout();
+  SchedulePaint();
 }
 
 void LocationBarView::AnimationEnded(const gfx::Animation* animation) {
   if (animation == show_url_animation_.get()) {
-    show_url_animation_->Reset();
-    OnShowURLAnimationEnded();
-  } else if (animation == hide_url_animation_.get()) {
+    ResetShowAnimationAndColors();
+    Layout();
+    SchedulePaint();
+  } else {
+    DCHECK(animation == hide_url_animation_.get());
     hide_url_animation_->Reset();
-    OnHideURLAnimationEnded();
+    origin_chip_view_->FadeIn();
+    omnibox_view_->HideURL();  // Calls OnChanged(), triggering layout.
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = NULL;
   // If the browser is no longer active, let's not show the info bubble, as this
@@ skipping 32 matching lines @@
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }