Make password generation switched by a preference in chrome settings rather than a command line fla…

chrome/browser/ui/webui/options2/browser_options_handler2.cc

Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
index 1a6481ac41723729dedc1c5b5dbe967198b2e7ad..f1f9f1b406a5af26be12ae7e0a2d0e1c047ef21b 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
@@ -214,6 +214,8 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
     { "passwordsAndAutofillGroupName",
       IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
     { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
+    { "passwordGenerationEnabledDescription",
+      IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL },
     { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
     { "privacyContentSettingsButton",
       IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
@@ -618,6 +620,7 @@ void BrowserOptionsHandler::InitializePage() {
 
   SetupMetricsReportingCheckbox();
   SetupMetricsReportingSettingVisibility();
+  SetupPasswordGenerationSettingVisibility();
   SetupFontSizeSelector();
   SetupPageZoomSelector();
   SetupAutoOpenFileTypes();
@@ -1333,6 +1336,14 @@ void BrowserOptionsHandler::SetupMetricsReportingSettingVisibility() {
 #endif
 }
 
+void BrowserOptionsHandler::SetupPasswordGenerationSettingVisibility() {
+  base::FundamentalValue visible(
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnablePasswordGeneration));
+  web_ui()->CallJavascriptFunction(
+      "BrowserOptions.setPasswordGenerationSettingVisibility", visible);
+}
+
 void BrowserOptionsHandler::SetupFontSizeSelector() {
   // We're only interested in integer values, so convert to int.
   base::FundamentalValue font_size(default_font_size_.GetValue());