[Material][Mac] Flag and clean for 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 103 matching lines @@
       save_credit_card_decoration_(
           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_(false),
+      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();
 
   edit_bookmarks_enabled_.Init(
       bookmarks::prefs::kEditBookmarksEnabled, profile->GetPrefs(),
       base::Bind(&LocationBarViewMac::OnEditBookmarksEnabledChanged,
                  base::Unretained(this)));
 
   zoom::ZoomEventManager::GetForBrowserContext(profile)
       ->AddZoomEventManagerObserver(this);
 
   [[field_ cell] setIsPopupMode:
       !browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)];
 
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kMaterialSecurityVerbose)) {
+    std::string security_verbose_flag =
+        command_line->GetSwitchValueASCII(switches::kMaterialSecurityVerbose);
+
+    should_show_secure_verbose_ =
+        security_verbose_flag ==
+            switches::kMaterialSecurityVerboseShowAllAnimated ||
+        security_verbose_flag ==
+            switches::kMaterialSecurityVerboseShowAllNonAnimated;
+
+    should_animate_security_verbose_ =
+        security_verbose_flag ==
+            switches::kMaterialSecurityVerboseShowAllAnimated ||
+        security_verbose_flag ==
+            switches::kMaterialSecurityVerboseShowNonSecureAnimated;
+  }
+
   // Sets images for the decorations, and performs a layout. This call ensures
   // that this class is in a consistent state after initialization.
   OnChanged();
 }
 
 LocationBarViewMac::~LocationBarViewMac() {
   // Disconnect from cell in case it outlives us.
   [[field_ cell] clearDecorations];
 
   zoom::ZoomEventManager::GetForBrowserContext(profile())
@@ skipping 321 matching lines @@
     keyword_hint_decoration_->SetKeyword(short_name, is_extension_keyword);
     keyword_hint_decoration_->SetVisible(true);
   } else if (ShouldShowEVBubble()) {
     // Switch from location icon to show the EV bubble instead.
     location_icon_decoration_->SetVisible(false);
     security_state_bubble_decoration_->SetVisible(true);
 
     base::string16 label(GetToolbarModel()->GetEVCertName());
     security_state_bubble_decoration_->SetFullLabel(
         base::SysUTF16ToNSString(label));
+    is_width_available_for_security_verbose_ = true;

[Robert Sesek, 2016/09/15 16:18:13]

I don't follow why this unconditionally true.

[spqchan, 2016/09/15 22:43:32]

only non-EV verbose should be hidden if the width it too narrow.
Added a comment for this.

+

[Robert Sesek, 2016/09/15 16:18:12]

nit: extra blank line

[spqchan, 2016/09/15 22:43:31]

Done.

   } else if (ShouldShowSecurityState()) {
-    // TODO(spqchan): Clean up location_bar_view_mac so that animation
-    // code isn't in Layout(). See crbug.com/642977.
-    bool is_security_state_visible = true;
     CGFloat available_width =
         [cell availableWidthInFrame:[[cell controlView] frame]];
-
-    if (available_width < kMinURLWidth) {
-      // If there's not enough space, animate out the security state bubble.
-      // Show it until it has finished animating out.
-      is_security_state_visible =
-          security_state_bubble_decoration_->AnimatingOut();
-      if (security_state_bubble_decoration_->HasAnimatedIn())
-        security_state_bubble_decoration_->AnimateOut();
-    } else if (security_state_bubble_decoration_->HasAnimatedOut()) {
-      // If there's enough space, but the secure state bubble had animated
-      // out, animate it back in.
-      security_state_bubble_decoration_->AnimateIn(false);
-    }
+    is_width_available_for_security_verbose_ = available_width >= kMinURLWidth;
+    bool is_security_state_visible =
+        is_width_available_for_security_verbose_ ||
+        security_state_bubble_decoration_->AnimatingOut();
+    location_icon_decoration_->SetVisible(!is_security_state_visible);
+    security_state_bubble_decoration_->SetVisible(is_security_state_visible);
 
     // 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));
     }
-
-    location_icon_decoration_->SetVisible(!is_security_state_visible);
-    security_state_bubble_decoration_->SetVisible(is_security_state_visible);
   }
 
   // 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) {
@@ skipping 54 matching lines @@
 void LocationBarViewMac::ResetTabState(WebContents* contents) {
   omnibox_view_->ResetTabState(contents);
 }
 
 void LocationBarViewMac::Update(const WebContents* contents) {
   UpdateManagePasswordsIconAndBubble();
   UpdateBookmarkStarVisibility();
   UpdateSaveCreditCardIcon();
   UpdateTranslateDecoration();
   UpdateZoomDecoration(/*default_zoom_changed=*/false);
+  UpdateSecurityState(contents);
   RefreshPageActionDecorations();
   RefreshContentSettingsDecorations();
   if (contents)
     omnibox_view_->OnTabChanged(contents);
   else
     omnibox_view_->Update();
 
   OnChanged();
-
-  // To avoid animating the security state bubble decoration if it
-  // should be hidden for a narrow omnibox, call UpdateSecurityState() after
-  // OnChanged().
-  UpdateSecurityState(contents);
 }
 
 void LocationBarViewMac::UpdateWithoutTabRestore() {
   Update(nullptr);
 }
 
 void LocationBarViewMac::UpdateLocationIcon() {
   SkColor vector_icon_color = GetLocationBarIconColor();
   gfx::VectorIconId vector_icon_id =
       ShouldShowEVBubble() ? gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID
@@ skipping 40 matching lines @@
 
 void LocationBarViewMac::OnChanged() {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     const int resource_id = omnibox_view_->GetIcon();
     NSImage* image = OmniboxViewMac::ImageForResource(resource_id);
     location_icon_decoration_->SetImage(image);
     security_state_bubble_decoration_->SetImage(image);
     Layout();
     return;
   }
+  UpdateSecurityState(false);
   UpdateLocationIcon();
 }
 
 ToolbarModel* LocationBarViewMac::GetToolbarModel() {
   return browser_->toolbar_model();
 }
 
 const ToolbarModel* LocationBarViewMac::GetToolbarModel() const {
   return browser_->toolbar_model();
 }
 
 WebContents* LocationBarViewMac::GetWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 bool LocationBarViewMac::ShouldShowEVBubble() const {
   return (GetToolbarModel()->GetSecurityLevel(false) ==
           security_state::SecurityStateModel::EV_SECURE);
 }
 
 bool LocationBarViewMac::ShouldShowSecurityState() const {
   security_state::SecurityStateModel::SecurityLevel security =
       GetToolbarModel()->GetSecurityLevel(false);
+
   bool has_verbose_for_security =
-      IsSecureConnection(security) ||
-      security == security_state::SecurityStateModel::SECURITY_ERROR;
+      security == security_state::SecurityStateModel::EV_SECURE ||
+      security == security_state::SecurityStateModel::SECURITY_ERROR ||
+      (security == security_state::SecurityStateModel::SECURE &&
+       should_show_secure_verbose_);
 
   return ui::MaterialDesignController::IsModeMaterial() &&
          has_verbose_for_security && !omnibox_view_->IsEditingOrEmpty() &&
          !omnibox_view_->model()->is_keyword_hint();
 }
 
 bool LocationBarViewMac::IsLocationBarDark() const {
   return [[field_ window] inIncognitoModeWithSystemTheme];
 }
 
@@ skipping 167 matching lines @@
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return false;
 
   return zoom_decoration_->UpdateIfNecessary(
       zoom::ZoomController::FromWebContents(web_contents), default_zoom_changed,
       IsLocationBarDark());
 }
 
 void LocationBarViewMac::UpdateSecurityState(bool tab_changed) {
-  // If the security level has changed, check if the verbose state decoration
-  // needs to be animated. If we need to show it, animate it in. Otherwise,
-  // animate it out if it's already fully displayed.
+  if (!ShouldShowSecurityState())
+    return;
+
   security_state::SecurityStateModel::SecurityLevel new_security_level =
       GetToolbarModel()->GetSecurityLevel(false);
   bool is_secure_to_secure = IsSecureConnection(new_security_level) &&
                              IsSecureConnection(security_level_);
-  if (ShouldShowSecurityState() &&
-      security_state_bubble_decoration_->IsVisible()) {
-    // Animate the verbose if we entered a new connection state on the current
-    // tab. If it had animated out (from a narrow width).
-    if (!tab_changed &&
-        (security_level_ != new_security_level && !is_secure_to_secure)) {
+  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())
+      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();
   }
-
-  security_level_ = new_security_level;
 }
 
 bool LocationBarViewMac::IsSecureConnection(
     security_state::SecurityStateModel::SecurityLevel level) const {
   return level == security_state::SecurityStateModel::SECURE ||
          level == security_state::SecurityStateModel::EV_SECURE;
 }
 
 void LocationBarViewMac::UpdateAccessibilityViewPosition(
     LocationBarDecoration* decoration) {
@@ skipping 25 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;
 }