[Views][Mac] Security Chip Default Value

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 122 matching lines @@
       open_pdf_in_reader_view_(nullptr),
       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_show_secure_state_(false),
+      should_show_nonsecure_state_(false),
       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::kSecurityChip)) {
     std::string security_chip_flag =
         command_line->GetSwitchValueASCII(switches::kSecurityChip);
     should_show_secure_state_ =
         security_chip_flag == switches::kSecurityChipShowAll;
+    should_show_nonsecure_state_ =
+        security_chip_flag == switches::kSecurityChipShowAll ||
+        security_chip_flag == switches::kSecurityChipShowNonSecureOnly;
   }
 
   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_nonsecure_state_ =
         security_chip_animation_flag ==
@@ skipping 821 matching lines @@
     FirstRunBubble::ShowBubble(browser, location_icon_view_);
 #endif
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_->visible() &&
       !suggested_text_view_->size().IsEmpty();
 }
 
 base::string16 LocationBarView::GetSecurityText() const {
-  return ShouldShowEVBubble() ? GetToolbarModel()->GetEVCertName()
-                              : GetToolbarModel()->GetSecureVerboseText();
+  bool has_ev_cert = (GetToolbarModel()->GetSecurityLevel(false) ==
+                      security_state::SecurityStateModel::EV_SECURE);
+  return has_ev_cert ? GetToolbarModel()->GetEVCertName()
+                     : GetToolbarModel()->GetSecureVerboseText();
 }
 
 bool LocationBarView::ShouldShowKeywordBubble() const {
   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 {
   using SecurityLevel = security_state::SecurityStateModel::SecurityLevel;
   const SecurityLevel level = GetToolbarModel()->GetSecurityLevel(false);
-  if (level == SecurityLevel::SECURE || level == SecurityLevel::EV_SECURE)
+  if (level == SecurityLevel::EV_SECURE) {
+    return true;
+  } else if (level == SecurityLevel::SECURE) {
     return should_show_secure_state_;
-  return level == SecurityLevel::DANGEROUS ||
-         level == SecurityLevel::HTTP_SHOW_WARNING;
+  } else {
+    return should_show_nonsecure_state_ &&
+           (level == SecurityLevel::DANGEROUS ||
+            level == SecurityLevel::HTTP_SHOW_WARNING);
+  }
 }
 
 bool LocationBarView::ShouldAnimateSecurityChip() const {
   using SecurityLevel = security_state::SecurityStateModel::SecurityLevel;
   SecurityLevel level = GetToolbarModel()->GetSecurityLevel(false);
   if (!ShouldShowSecurityChip())
     return false;
   if (level == SecurityLevel::SECURE || level == SecurityLevel::EV_SECURE)
     return should_animate_secure_state_;
   return should_animate_nonsecure_state_ &&
@@ skipping 309 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();
 }