Add a feature flag for the security verbose

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 34 matching lines @@
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/zoom_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h"
 #include "chrome/browser/ui/views/translate/translate_bubble_view.h"
 #include "chrome/browser/ui/views/translate/translate_icon_view.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "components/omnibox/browser/omnibox_popup_view.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/toolbar/toolbar_model.h"
 #include "components/translate/core/browser/language_state.h"
+#include "components/variations/variations_associated_data.h"
 #include "components/zoom/zoom_controller.h"
 #include "components/zoom/zoom_event_manager.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/feature_switch.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
@@ skipping 68 matching lines @@
       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();
+  std::string security_chip;

[Peter Kasting, 2016/10/24 21:08:16]

Nit: |security_chip_visibility| to match constant name

[spqchan, 2016/10/24 22:44:56]

Done.

   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;
+    security_chip = command_line->GetSwitchValueASCII(switches::kSecurityChip);
+  } else if (base::FeatureList::IsEnabled(features::kSecurityChip)) {
+    security_chip = variations::GetVariationParamValueByFeature(
+        features::kSecurityChip, kSecurityChipFeatureVisibilityParam);
   }
 
+  if (security_chip == switches::kSecurityChipShowNonSecureOnly) {
+    should_show_nonsecure_state_ = true;
+  } else if (security_chip == switches::kSecurityChipShowAll) {
+    should_show_secure_state_ = true;
+    should_show_nonsecure_state_ = true;
+  }

[Peter Kasting, 2016/10/24 21:08:17]

Nit: Shorter:

  should_show_secure_state_ = security_chip == switches::kSecurityChipShowAll;
  should_show_nonsecure_state_ =
      should_show_secure_state_ ||
      (security_chip == switches::kSecurityChipShowNonSecureOnly);

A similar comment applies to the animation block below.

[spqchan, 2016/10/24 22:44:56]

Done.

+
+  std::string security_chip_animation;
   if (command_line->HasSwitch(switches::kSecurityChipAnimation)) {
-    std::string security_chip_animation_flag =
+    security_chip_animation =
         command_line->GetSwitchValueASCII(switches::kSecurityChipAnimation);
-    should_animate_secure_state_ =
-        security_chip_animation_flag == switches::kSecurityChipAnimationAll;
+  } else if (base::FeatureList::IsEnabled(features::kSecurityChip)) {
+    security_chip_animation = variations::GetVariationParamValueByFeature(
+        features::kSecurityChip, kSecurityChipFeatureAnimationParam);
+  }
 
-    should_animate_nonsecure_state_ =
-        security_chip_animation_flag ==
-            switches::kSecurityChipAnimationNonSecureOnly ||
-        security_chip_animation_flag == switches::kSecurityChipAnimationAll;
+  if (security_chip_animation ==
+      switches::kSecurityChipAnimationNonSecureOnly) {
+    should_animate_nonsecure_state_ = true;
+  } else if (security_chip_animation == switches::kSecurityChipAnimationAll) {
+    should_animate_secure_state_ = true;
+    should_animate_nonsecure_state_ = true;
   }
 }
 
 LocationBarView::~LocationBarView() {
   if (template_url_service_)
     template_url_service_->RemoveObserver(this);
 
   zoom::ZoomEventManager::GetForBrowserContext(profile())
       ->RemoveZoomEventManagerObserver(this);
 }
@@ skipping 1161 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();
 }