[Material] Update Material Security Verbose Decoration Flag

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),
+      should_show_secure_verbose_(true),
+      should_animate_secure_verbose_(false),
+      should_animate_nonsecure_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)) {
+  if (command_line->HasSwitch(switches::kSecurityVerboseDecoration)) {
     std::string security_verbose_flag =
-        command_line->GetSwitchValueASCII(switches::kMaterialSecurityVerbose);
+        command_line->GetSwitchValueASCII(switches::kSecurityVerboseDecoration);
 
     should_show_secure_verbose_ =
         security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowAllAnimated ||
+            switches::kSecurityVerboseDecorationShowAllAnimated ||
         security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowAllNonAnimated;
+            switches::kSecurityVerboseDecorationShowAllNonAnimated ||
+        security_verbose_flag ==
+            switches::
+                kSecurityVerboseDecorationShowAllWithOnlyNonSecureAnimated;
 
-    should_animate_security_verbose_ =
+    should_animate_secure_verbose_ =
         security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowAllAnimated ||
+        switches::kSecurityVerboseDecorationShowAllAnimated;
+
+    should_animate_nonsecure_verbose_ =
         security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowNonSecureAnimated;
+            switches::kSecurityVerboseDecorationShowAllAnimated ||
+        security_verbose_flag ==
+            switches::kSecurityVerboseDecorationShowNonSecureAnimated ||
+        security_verbose_flag ==
+            switches::
+                kSecurityVerboseDecorationShowAllWithOnlyNonSecureAnimated;
   }
 
   // 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];
@@ skipping 689 matching lines @@
       zoom::ZoomController::FromWebContents(web_contents), default_zoom_changed,
       IsLocationBarDark());
 }
 
 void LocationBarViewMac::UpdateSecurityState(bool tab_changed) {
   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_);
+  bool is_new_level_secure = IsSecureConnection(new_security_level);
+  bool is_secure_to_secure =
+      is_new_level_secure && 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_) {
+    bool is_animated =
+        (is_new_level_secure && should_animate_secure_verbose_) ||
+        (!is_new_level_secure && should_animate_nonsecure_verbose_);
+
     if (security_state_bubble_decoration_->HasAnimatedOut())
       security_state_bubble_decoration_->AnimateIn(false);
-    else if (!should_animate_security_verbose_ || tab_changed)
+    else if (tab_changed || !is_animated)
       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();
   }
 }
 
 bool LocationBarViewMac::IsSecureConnection(
@@ skipping 32 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;
 }