[Material] Update Material Security Verbose Decoration Flag

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"
@@ skipping 123 matching lines @@
       manage_passwords_icon_view_(nullptr),
       save_credit_card_icon_view_(nullptr),
       translate_icon_view_(nullptr),
       star_view_(nullptr),
       size_animation_(this),
       is_popup_mode_(is_popup_mode),
       show_focus_rect_(false),
       template_url_service_(NULL),
       web_contents_null_at_last_refresh_(true),
       should_show_secure_state_(true),
-      should_animate_secure_state_(true) {
+      should_animate_secure_state_(false),
+      should_animate_nonsecure_state_(false) {
   edit_bookmarks_enabled_.Init(
       bookmarks::prefs::kEditBookmarksEnabled, profile->GetPrefs(),
       base::Bind(&LocationBarView::UpdateWithoutTabRestore,
                  base::Unretained(this)));
 
   zoom::ZoomEventManager::GetForBrowserContext(profile)
       ->AddZoomEventManagerObserver(this);
 
   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_state_ =
         security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowAllAnimated ||
+            switches::kSecurityVerboseDecorationShowAllAnimated ||
         security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowAllNonAnimated;
+            switches::kSecurityVerboseDecorationShowAllNonAnimated ||
+        security_verbose_flag ==
+            switches::
+                kSecurityVerboseDecorationShowAllWithOnlyNonSecureAnimated;
 
     should_animate_secure_state_ =
         security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowAllAnimated ||
+        switches::kSecurityVerboseDecorationShowAllAnimated;
+
+    should_animate_nonsecure_state_ =
         security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowNonSecureAnimated;
+            switches::kSecurityVerboseDecorationShowAllAnimated ||
+        security_verbose_flag ==
+            switches::kSecurityVerboseDecorationShowNonSecureAnimated ||
+        security_verbose_flag ==
+            switches::
+                kSecurityVerboseDecorationShowAllWithOnlyNonSecureAnimated;
   }
 }
 
 LocationBarView::~LocationBarView() {
   if (template_url_service_)
     template_url_service_->RemoveObserver(this);
 
   zoom::ZoomEventManager::GetForBrowserContext(profile())
       ->RemoveZoomEventManagerObserver(this);
 }
@@ skipping 320 matching lines @@
 
   min_size.set_height(min_size.height() * size_animation_.GetCurrentValue());
 
   const int padding = GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
 
   // Compute width of omnibox-leading content.
   const int edge_thickness = GetHorizontalEdgeThickness();
   int leading_width = edge_thickness;
   if (ShouldShowKeywordBubble()) {
     // The selected keyword view can collapse completely.
-  } else if (ShouldShowSecurityChip()) {
+  } else if (ShouldShowSecurityChip(nullptr)) {
     base::string16 security_text = GetSecurityText();
     leading_width +=
         GetLayoutConstant(LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING) +
         location_icon_view_->GetMinimumSizeForLabelText(security_text).width();
   } else {
     leading_width += padding + location_icon_view_->GetMinimumSize().width();
   }
 
   // Compute width of omnibox-trailing content.
   int trailing_width = edge_thickness;
@@ skipping 56 matching lines @@
           GetTemplateURLForKeyword(keyword);
       if (template_url &&
           (template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION)) {
         gfx::Image image = extensions::OmniboxAPI::Get(profile())->
             GetOmniboxIcon(template_url->GetExtensionId());
         selected_keyword_view_->SetImage(image.AsImageSkia());
       } else {
         selected_keyword_view_->ResetImage();
       }
     }
-  } else if (ShouldShowSecurityChip()) {
+  } else if (ShouldShowSecurityChip(nullptr)) {
     location_icon_view_->SetLabel(GetSecurityText());
     // The largest fraction of the omnibox that can be taken by the EV bubble.
     const double kMaxBubbleFraction = 0.5;
     leading_decorations.AddDecoration(
         vertical_padding, location_height, false, kMaxBubbleFraction,
         bubble_horizontal_padding, item_padding, location_icon_view_);
   } else {
     leading_decorations.AddDecoration(vertical_padding, location_height,
                                       location_icon_view_);
   }
@@ skipping 166 matching lines @@
   open_pdf_in_reader_view_->Update(web_contents_for_sub_views);
 
   if (star_view_)
     UpdateBookmarkStarVisibility();
 
   if (contents)
     omnibox_view_->OnTabChanged(contents);
   else
     omnibox_view_->Update();
 
-  bool should_show = ShouldShowSecurityChip();
-  location_icon_view_->SetSecurityState(
-      should_show, should_show && !contents && should_animate_secure_state_);
+  bool should_animate;
+  bool should_show = ShouldShowSecurityChip(&should_animate);
+  location_icon_view_->SetSecurityState(should_show,
+                                        !contents && should_animate);
 
   OnChanged();  // NOTE: Calls Layout().
 }
 
 void LocationBarView::ResetTabState(WebContents* contents) {
   omnibox_view_->ResetTabState(contents);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, public OmniboxEditController implementation:
@@ skipping 217 matching lines @@
   return !omnibox_view_->model()->keyword().empty() &&
       !omnibox_view_->model()->is_keyword_hint();
 }
 
 bool LocationBarView::ShouldShowEVBubble() const {
   return (GetToolbarModel()->GetSecurityLevel(false) ==
           security_state::SecurityStateModel::EV_SECURE) &&
          should_show_secure_state_;
 }
 
-bool LocationBarView::ShouldShowSecurityChip() const {
+bool LocationBarView::ShouldShowSecurityChip(bool* should_animate) const {
   using SecurityLevel = security_state::SecurityStateModel::SecurityLevel;
   SecurityLevel level = GetToolbarModel()->GetSecurityLevel(false);
-  return ((level == SecurityLevel::SECURE ||
-           level == SecurityLevel::EV_SECURE) &&
-          should_show_secure_state_) ||
-         level == SecurityLevel::DANGEROUS;
+
+  bool should_show =
+      ((level == SecurityLevel::SECURE || level == SecurityLevel::EV_SECURE) &&
+       should_show_secure_state_) ||
+      level == SecurityLevel::DANGEROUS;
+
+  if (should_animate) {
+    bool is_secure_level =
+        level == SecurityLevel::EV_SECURE || level == SecurityLevel::SECURE;
+    *should_animate =
+        should_show && ((level == SecurityLevel::DANGEROUS &&
+                         should_animate_nonsecure_state_) ||
+                        (is_secure_level && should_animate_secure_state_));
+  }
+
+  return should_show;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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 297 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = nullptr;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }