[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 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();

[Kevin Bailey, 2016/10/04 15:10:17]

You'll need Peter's approval for this file, but speaking for myself, I would add
a 'bool* should_animate' parameter to ShouldShowSecurityChip() and push this
logic down there. '!contents' can remain here.

[spqchan, 2016/10/05 01:39:49]

Sounds good, I'll add pkasting. I wanted to get a pass from you first. I added
the param. I'm not too sure about about it since ShouldShowSecurityChip also
gets called with GetPreferredSize(), in which is doesn't need to know if it's
animating or not, but I don't have strong feelings about it. 

-  location_icon_view_->SetSecurityState(
-      should_show, should_show && !contents && should_animate_secure_state_);
+
+  security_state::SecurityStateModel::SecurityLevel security_level =
+      GetToolbarModel()->GetSecurityLevel(false);
+  bool is_secure_level =
+      security_level == security_state::SecurityStateModel::EV_SECURE ||
+      security_level == security_state::SecurityStateModel::SECURE;
+  bool should_animate =
+      should_show && !contents &&
+      ((security_level == security_state::SecurityStateModel::DANGEROUS &&
+        should_animate_nonsecure_state_) ||
+       (is_secure_level && should_animate_secure_state_));
+
+  location_icon_view_->SetSecurityState(should_show, should_animate);
 
   OnChanged();  // NOTE: Calls Layout().
 }
 
 void LocationBarView::ResetTabState(WebContents* contents) {
   omnibox_view_->ResetTabState(contents);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, public OmniboxEditController implementation:
@@ skipping 541 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();
 }