summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/password_manager/password_manager.cc18
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h1
3 files changed, 16 insertions, 6 deletions
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index 15bfb8c..e1390aa 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/password_manager/password_manager.h"
+#include "base/command_line.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "base/prefs/pref_service.h"
@@ -13,6 +14,7 @@
#include "chrome/browser/password_manager/password_form_manager.h"
#include "chrome/browser/password_manager/password_manager_delegate.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/pref_names.h"
#include "components/autofill/core/common/autofill_messages.h"
@@ -308,12 +310,16 @@ void PasswordManager::OnPasswordFormsRendered(
provisional_save_manager_->SubmitPassed();
if (provisional_save_manager_->HasGeneratedPassword())
UMA_HISTOGRAM_COUNTS("PasswordGeneration.Submitted", 1);
- if (ShouldShowSavePasswordInfoBar()) {
- delegate_->AddSavePasswordInfoBarIfPermitted(
- provisional_save_manager_.release());
- } else {
- provisional_save_manager_->Save();
- provisional_save_manager_.reset();
+
+ if(!CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableSavePasswordBubble)){
+ if (ShouldShowSavePasswordInfoBar()) {
+ delegate_->AddSavePasswordInfoBarIfPermitted(
+ provisional_save_manager_.release());
+ } else {
+ provisional_save_manager_->Save();
+ provisional_save_manager_.reset();
+ }
}
}
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 9c4a84c..29c5b2fe 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -654,6 +654,9 @@ const char kEnableResetProfileSettings[] = "enable-reset-profile-settings";
const char kEnableResourceContentSettings[] =
"enable-resource-content-settings";
+// Enables save password prompt bubble.
+const char kEnableSavePasswordBubble[] = "enable-save-password-bubble";
+
// Controls the support for SDCH filtering (dictionary based expansion of
// content). By default SDCH filtering is enabled. To disable SDCH filtering,
// use "--enable-sdch=0" as command line argument. SDCH is currently only
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 8322ae0..f442338 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -187,6 +187,7 @@ extern const char kEnableQuicHttps[];
extern const char kEnableQuickofficeEdit[];
extern const char kEnableResetProfileSettings[];
extern const char kEnableResourceContentSettings[];
+extern const char kEnableSavePasswordBubble[];
extern const char kEnableSdch[];
extern const char kDisableSpdy31[];
extern const char kEnableSpdy4a2[];