Fix chip UI interaction with omnibox

Temporary hide chip when user starts typing in the omnibox and re-show
it after user exits the edit mode.

Bug: 1153197
Change-Id: Ibb5cce6e384b6fe6e0a52a4fda838ca26cab208f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2574277
Commit-Queue: Olesia Marukhno <olesiamarukhno@google.com>
Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836139}

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

@@ -1155,6 +1155,7 @@ void LocationBarView::OnChanged() {
   SchedulePaint();
   UpdateSendTabToSelfIcon();
   UpdateQRCodeGeneratorIcon();
+  UpdatePermissionChipVisibility();
 }
 
 void LocationBarView::OnPopupVisibilityChanged() {
@@ -1286,3 +1287,16 @@ ui::ImageModel LocationBarView::GetLocationIcon(
                                       std::move(on_icon_fetched))
              : ui::ImageModel();
 }
+
+void LocationBarView::UpdatePermissionChipVisibility() {
+  if (!permission_chip()->HasActiveRequest()) {
+    DCHECK(!permission_chip()->GetVisible());
+    return;
+  }
+
+  if (IsEditingOrEmpty()) {
+    permission_chip()->Hide();
+  } else {
+    permission_chip()->Reshow();
+  }
+}

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

@@ -347,6 +347,10 @@ class LocationBarView : public LocationBar,
   // Returns true if visibility changed.
   bool UpdateSendTabToSelfIcon();
 
+  // Updates the visibility of the permission chip when omnibox is in the edit
+  // mode.
+  void UpdatePermissionChipVisibility();
+
   // The Browser this LocationBarView is in.  Note that at least
   // chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser
   // window, so this may be NULL.

chrome/browser/ui/views/location_bar/permission_chip.cc

@@ -102,9 +102,7 @@ PermissionChip::PermissionChip(Browser* browser)
       std::make_unique<views::Button::DefaultButtonControllerDelegate>(
           chip_button_)));
 
-  constexpr auto kAnimationDuration = base::TimeDelta::FromMilliseconds(350);
   animation_ = std::make_unique<gfx::SlideAnimation>(this);
-  animation_->SetSlideDuration(kAnimationDuration);
 }
 
 PermissionChip::~PermissionChip() {
@@ -113,7 +111,8 @@ PermissionChip::~PermissionChip() {
   CHECK(!IsInObserverList());
 }
 
-void PermissionChip::Show(permissions::PermissionPrompt::Delegate* delegate) {
+void PermissionChip::DisplayRequest(
+    permissions::PermissionPrompt::Delegate* delegate) {
   DCHECK(delegate);
   delegate_ = delegate;
 
@@ -136,16 +135,14 @@ void PermissionChip::Show(permissions::PermissionPrompt::Delegate* delegate) {
   SetVisible(true);
   // TODO(olesiamarukhno): Add tests for animation logic.
   animation_->Reset();
-  is_collapsed_ = true;
   if (!delegate_->WasCurrentRequestAlreadyDisplayed()) {
-    animation_->Show();
-    is_collapsed_ = false;
+    AnimateExpand();
   }
   requested_time_ = base::TimeTicks::Now();
   PreferredSizeChanged();
 }
 
-void PermissionChip::Hide() {
+void PermissionChip::FinalizeRequest() {
   SetVisible(false);
   timer_.AbandonAndStop();
   delegate_ = nullptr;
@@ -155,6 +152,38 @@ void PermissionChip::Hide() {
   PreferredSizeChanged();
 }
 
+void PermissionChip::Reshow() {
+  if (GetVisible())
+    return;
+
+  SetVisible(true);
+  // TODO(olesiamarukhno): Add tests for animation logic.
+  animation_->Reset();
+  if (!delegate_->WasCurrentRequestAlreadyDisplayed())
+    AnimateExpand();
+  PreferredSizeChanged();
+}
+
+void PermissionChip::Hide() {
+  SetVisible(false);
+}
+
+void PermissionChip::AnimateCollapse() {
+  constexpr auto kAnimationDuration = base::TimeDelta::FromMilliseconds(250);
+  animation_->SetSlideDuration(kAnimationDuration);
+  animation_->Hide();
+}
+
+void PermissionChip::AnimateExpand() {
+  constexpr auto kAnimationDuration = base::TimeDelta::FromMilliseconds(350);
+  animation_->SetSlideDuration(kAnimationDuration);
+  animation_->Show();
+}
+
+bool PermissionChip::HasActiveRequest() {
+  return delegate_;
+}
+
 gfx::Size PermissionChip::CalculatePreferredSize() const {
   const int fixed_width = GetIconSize() + chip_button_->GetInsets().width();
   const int collapsable_width =
@@ -177,6 +206,7 @@ void PermissionChip::OnThemeChanged() {
 
 void PermissionChip::AnimationEnded(const gfx::Animation* animation) {
   DCHECK_EQ(animation, animation_.get());
+  is_collapsed_ = animation->GetCurrentValue() != 1.0;
   if (animation->GetCurrentValue() == 1.0)
     StartCollapseTimer();
 }
@@ -190,8 +220,7 @@ void PermissionChip::OnWidgetDestroying(views::Widget* widget) {
   DCHECK_EQ(widget, prompt_bubble_->GetWidget());
   widget->RemoveObserver(this);
   prompt_bubble_ = nullptr;
-  animation_->Hide();
-  is_collapsed_ = true;
+  AnimateCollapse();
 }
 
 void PermissionChip::OpenBubble() {
@@ -224,8 +253,7 @@ void PermissionChip::Collapse() {
   if (IsMouseHovered() || prompt_bubble_) {
     StartCollapseTimer();
   } else {
-    animation_->Hide();
-    is_collapsed_ = true;
+    AnimateCollapse();
   }
 }
 

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

@@ -39,9 +39,12 @@ class PermissionChip : public views::View,
 
   ~PermissionChip() override;
 
-  void Show(permissions::PermissionPrompt::Delegate* delegate);
-  void Hide();
+  void DisplayRequest(permissions::PermissionPrompt::Delegate* delegate);
+  void FinalizeRequest();
   void OpenBubble();
+  void Hide();
+  void Reshow();
+  bool HasActiveRequest();
 
   views::Button* button() { return chip_button_; }
   bool is_collapsed() { return is_collapsed_; }
@@ -74,6 +77,9 @@ class PermissionChip : public views::View,
   base::string16 GetPermissionMessage();
   const gfx::VectorIcon& GetPermissionIconId();
 
+  void AnimateCollapse();
+  void AnimateExpand();
+
   Browser* browser_ = nullptr;
   permissions::PermissionPrompt::Delegate* delegate_ = nullptr;
   PermissionPromptBubbleView* prompt_bubble_ = nullptr;

chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc

@@ -71,7 +71,7 @@ PermissionPromptImpl::~PermissionPromptImpl() {
     case PermissionPromptStyle::kChip:
       DCHECK(!prompt_bubble_);
       DCHECK(permission_chip_);
-      permission_chip_->Hide();
+      permission_chip_->FinalizeRequest();
       permission_chip_ = nullptr;
       break;
     case PermissionPromptStyle::kQuiet:
@@ -108,7 +108,7 @@ void PermissionPromptImpl::UpdateAnchorPosition() {
       // If there is fresh pending request shown as chip UI and location bar
       // isn't visible anymore, show bubble UI instead.
       if (!permission_chip_->is_collapsed() && !is_location_bar_drawn) {
-        permission_chip_->Hide();
+        permission_chip_->FinalizeRequest();
         permission_chip_ = nullptr;
         ShowBubble();
       }
@@ -128,7 +128,7 @@ void PermissionPromptImpl::ShowChipUI() {
   DCHECK(lbv);
 
   permission_chip_ = lbv->permission_chip();
-  permission_chip_->Show(delegate_);
+  permission_chip_->DisplayRequest(delegate_);
   prompt_style_ = PermissionPromptStyle::kChip;
 }