[Mac] Fix Animation Issue With the Security State Decoration

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/stl_util.h"
@@ skipping 104 matching lines @@
           new SaveCreditCardDecoration(command_updater)),
       star_decoration_(new StarDecoration(command_updater)),
       translate_decoration_(new TranslateDecoration(command_updater)),
       zoom_decoration_(new ZoomDecoration(this)),
       keyword_hint_decoration_(new KeywordHintDecoration()),
       manage_passwords_decoration_(
           new ManagePasswordsDecoration(command_updater, this)),
       browser_(browser),
       location_bar_visible_(true),
       should_show_secure_verbose_(true),
-      should_animate_security_verbose_(true),
+      should_animate_security_verbose_(false),
       is_width_available_for_security_verbose_(false),
       weak_ptr_factory_(this) {
   ScopedVector<ContentSettingImageModel> models =
       ContentSettingImageModel::GenerateContentSettingImageModels();
   for (ContentSettingImageModel* model : models.get()) {
     // ContentSettingDecoration takes ownership of its model.
     content_setting_decorations_.push_back(
         new ContentSettingDecoration(model, this, profile));
   }
   models.weak_clear();
@@ skipping 384 matching lines @@
 
     // Don't change the label if the bubble is in the process of animating
     // out the old one.
     base::string16 label(GetToolbarModel()->GetSecureVerboseText());
     if (!security_state_bubble_decoration_->AnimatingOut()) {
       security_state_bubble_decoration_->SetFullLabel(
           base::SysUTF16ToNSString(label));
     }
   }
 
+  if (!security_state_bubble_decoration_->IsVisible())
+    security_state_bubble_decoration_->ResetAnimation();
+
   // These need to change anytime the layout changes.
   // TODO(shess): Anytime the field editor might have changed, the
   // cursor rects almost certainly should have changed.  The tooltips
   // might change even when the rects don't change.
   OnDecorationsChanged();
 }
 
 void LocationBarViewMac::RedrawDecoration(LocationBarDecoration* decoration) {
   AutocompleteTextFieldCell* cell = [field_ cell];
   NSRect frame = [cell frameForDecoration:decoration
@@ skipping 334 matching lines @@
                              IsSecureConnection(security_level_);
   bool is_new_security_level =
       security_level_ != new_security_level && !is_secure_to_secure;
   security_level_ = new_security_level;
 
   // If there's enough space, but the secure state decoration had animated
   // out, animate it back in. Otherwise, if the security state has changed,
   // animate the decoration if animation is enabled and the state changed is
   // not from a tab switch.
   if (is_width_available_for_security_verbose_) {
-    if (security_state_bubble_decoration_->HasAnimatedOut())
+    if (!tab_changed && security_state_bubble_decoration_->HasAnimatedOut())
       security_state_bubble_decoration_->AnimateIn(false);
     else if (!should_animate_security_verbose_ || tab_changed)
       security_state_bubble_decoration_->ShowWithoutAnimation();
     else if (is_new_security_level)
       security_state_bubble_decoration_->AnimateIn();
   } else {
     // Animate the decoration out if there's not enough space.
     security_state_bubble_decoration_->AnimateOut();
   }
 }
@@ skipping 34 matching lines @@
     OnDecorationsChanged();
 }
 
 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() {
   std::vector<LocationBarDecoration*> decorations = GetDecorations();
   std::vector<NSView*> views;
   for (auto* decoration : decorations)
     views.push_back(decoration->GetAccessibilityView());
   return views;
 }