[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)) {
-    std::string security_verbose_flag =
-        command_line->GetSwitchValueASCII(switches::kMaterialSecurityVerbose);
+  if (command_line->HasSwitch(switches::kSecurityChip)) {
+    std::string security_chip_flag =
+        command_line->GetSwitchValueASCII(switches::kSecurityChip);
+    should_show_secure_state_ =
+        security_chip_flag == switches::kSecurityChipShowAll;
+  }
 
-    should_show_secure_state_ =
-        security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowAllAnimated ||
-        security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowAllNonAnimated;
+  if (command_line->HasSwitch(switches::kSecurityChipAnimation)) {
+    std::string security_chip_animation_flag =
+        command_line->GetSwitchValueASCII(switches::kSecurityChipAnimation);
+    should_animate_secure_state_ =
+        security_chip_animation_flag == switches::kSecurityChipAnimationAll;
 
-    should_animate_secure_state_ =
-        security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowAllAnimated ||
-        security_verbose_flag ==
-            switches::kMaterialSecurityVerboseShowNonSecureAnimated;
+    should_animate_nonsecure_state_ =
+        security_chip_animation_flag ==
+            switches::kSecurityChipAnimationNonSecureOnly ||
+        security_chip_animation_flag == switches::kSecurityChipAnimationAll;
   }
 }
 
 LocationBarView::~LocationBarView() {
   if (template_url_service_)
     template_url_service_->RemoveObserver(this);
 
   zoom::ZoomEventManager::GetForBrowserContext(profile())
       ->RemoveZoomEventManagerObserver(this);
 }
@@ skipping 584 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_);
+      ShouldShowSecurityChip(), !contents && ShouldAnimateSecurityChip());
 
   OnChanged();  // NOTE: Calls Layout().
 }
 
 void LocationBarView::ResetTabState(WebContents* contents) {
   omnibox_view_->ResetTabState(contents);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, public OmniboxEditController implementation:
@@ skipping 220 matching lines @@
 
 bool LocationBarView::ShouldShowEVBubble() const {
   return (GetToolbarModel()->GetSecurityLevel(false) ==
           security_state::SecurityStateModel::EV_SECURE) &&
          should_show_secure_state_;
 }
 
 bool LocationBarView::ShouldShowSecurityChip() const {
   using SecurityLevel = security_state::SecurityStateModel::SecurityLevel;
   SecurityLevel level = GetToolbarModel()->GetSecurityLevel(false);
+

[Peter Kasting, 2016/10/11 22:14:50]

Nit: Any particular reason you added this blank line?

[spqchan, 2016/10/12 20:25:48]

Whoops, removed

   return ((level == SecurityLevel::SECURE ||
            level == SecurityLevel::EV_SECURE) &&
           should_show_secure_state_) ||
          level == SecurityLevel::DANGEROUS;
 }
 
+bool LocationBarView::ShouldAnimateSecurityChip() const {
+  using SecurityLevel = security_state::SecurityStateModel::SecurityLevel;
+  SecurityLevel level = GetToolbarModel()->GetSecurityLevel(false);
+  bool is_secure_level =
+      level == SecurityLevel::EV_SECURE || level == SecurityLevel::SECURE;
+  return ShouldShowSecurityChip() &&
+         ((level == SecurityLevel::DANGEROUS &&
+           should_animate_nonsecure_state_) ||
+          (is_secure_level && should_animate_secure_state_));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // 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()) {
     template_url_service_ = url_service;
     template_url_service_->AddObserver(this);
@@ skipping 295 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();
 }