components/password_manager/core/browser/password_autofill_manager.cc - Issue 2588133002: Make form-not-secure controllable as its own separate Finch feature

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/password_manager/core/browser/password_autofill_manager.cc

Issue 2588133002: Make form-not-secure controllable as its own separate Finch feature (Closed)

Patch Set: elawrence, mathp comments; update histograms.xml Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/app/generated_resources.grd ('K') | « components/autofill/core/browser/autofill_manager_unittest.cc ('k') | components/password_manager/core/browser/password_autofill_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/password_manager/core/browser/password_autofill_manager.cc

diff --git a/components/password_manager/core/browser/password_autofill_manager.cc b/components/password_manager/core/browser/password_autofill_manager.cc

index 56f3efc22dca764c64429179311ed0c279036c1b..ffe19fede2a091eeb37a76fdb391a3394acaea8f 100644

--- a/components/password_manager/core/browser/password_autofill_manager.cc

+++ b/components/password_manager/core/browser/password_autofill_manager.cc

@@ -12,6 +12,7 @@

#include "base/command_line.h"

#include "base/i18n/case_conversion.h"

#include "base/logging.h"

+#include "base/metrics/field_trial.h"

#include "base/metrics/histogram_macros.h"

#include "base/strings/string16.h"

#include "base/strings/string_util.h"

@@ -26,7 +27,7 @@

#include "components/password_manager/core/browser/affiliation_utils.h"

#include "components/password_manager/core/browser/password_manager_driver.h"

#include "components/password_manager/core/browser/password_manager_metrics_util.h"

-#include "components/security_state/core/switches.h"

+#include "components/security_state/core/security_state.h"

#include "components/strings/grit/components_strings.h"

#include "grit/components_strings.h"

#include "ui/base/l10n/l10n_util.h"

@@ -212,12 +213,7 @@ void PasswordAutofillManager::OnShowPasswordSuggestions(

bool is_context_secure = autofill_client_->IsContextSecure(origin) &&

(!origin.is_valid() || !origin.SchemeIs("http"));

- std::string choice =

- base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

- security_state::switches::kMarkHttpAs);

- if (!is_context_secure &&

- choice == security_state::switches::

- kMarkHttpWithPasswordsOrCcWithChipAndFormWarning) {

+ if (!is_context_secure && security_state::IsHttpWarningInFormEnabled()) {

std::string icon_str;

// Show http info icon for http sites.