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

chrome/browser/autofill/autofill_manager.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/autofill/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 171 matching lines @@
       personal_data_(NULL),
       download_manager_(tab_contents->profile(), this),
       disable_download_manager_requests_(false),
       metric_logger_(new AutofillMetrics),
       has_logged_autofill_enabled_(false),
       has_logged_address_suggestions_count_(false),
       did_show_suggestions_(false),
       user_did_type_(false),
       user_did_autofill_(false),
       user_did_edit_autofilled_field_(false),
+      password_sync_enabled_(false),
       password_generation_enabled_(false),
       external_delegate_(NULL) {
   // |personal_data_| is NULL when using test-enabled WebContents.
   personal_data_ = PersonalDataManagerFactory::GetForProfile(
       tab_contents->profile()->GetOriginalProfile());
   RegisterWithSyncService();
+  registrar_.Init(tab_contents->profile()->GetPrefs());
+  registrar_.Add(prefs::kPasswordGenerationEnabled, this);
 }
 
 AutofillManager::~AutofillManager() {
   if (sync_service_ && sync_service_->HasObserver(this))
     sync_service_->RemoveObserver(this);
 }
 
 // static
 void AutofillManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kAutofillEnabled,
                              true,
                              PrefService::SYNCABLE_PREF);
+  prefs->RegisterBooleanPref(prefs::kPasswordGenerationEnabled,
+                             true,

[Garrett Casto, 2012/04/26 23:23:59]

We are going to have this be an opt-in feature at first, so this should default
to false.

[zysxqn, 2012/04/27 18:38:34]

Done.

+                             PrefService::SYNCABLE_PREF);
 #if defined(OS_MACOSX)
   prefs->RegisterBooleanPref(prefs::kAutofillAuxiliaryProfilesEnabled,
                              true,
                              PrefService::SYNCABLE_PREF);
 #else
   prefs->RegisterBooleanPref(prefs::kAutofillAuxiliaryProfilesEnabled,
                              false,
                              PrefService::UNSYNCABLE_PREF);
 #endif
   prefs->RegisterDoublePref(prefs::kAutofillPositiveUploadRate,
                             kAutofillPositiveUploadRateDefaultValue,
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterDoublePref(prefs::kAutofillNegativeUploadRate,
                             kAutofillNegativeUploadRateDefaultValue,
                             PrefService::UNSYNCABLE_PREF);
 }
 
 void AutofillManager::RegisterWithSyncService() {
   ProfileSyncService* temp_sync_service =
       ProfileSyncServiceFactory::GetForProfile(
           tab_contents_wrapper_->profile());
   if (temp_sync_service) {
     sync_service_ = temp_sync_service->AsWeakPtr();
     sync_service_->AddObserver(this);
   }
 }
 
+void AutofillManager::SendPasswordSyncStateToRenderer(

[Garrett Casto, 2012/04/26 23:23:59]

Remove this.

+    content::RenderViewHost* host, bool enabled) {
+  host->Send(new AutofillMsg_PasswordSyncEnabled(host->GetRoutingID(),
+                                                       enabled));
+}
+
+void AutofillManager::UpdatePasswordSyncState(
+    content::RenderViewHost* host,
+    bool new_renderer) {
+  if (!sync_service_)
+    return;
+
+  // Also need to check whether password manager is enabled.
+  syncable::ModelTypeSet sync_set = sync_service_->GetPreferredDataTypes();
+  bool new_password_sync_enabled =
+      sync_service_->HasSyncSetupCompleted() &&
+      sync_set.Has(syncable::PASSWORDS) &&
+      tab_contents_wrapper_->password_manager()->IsEnabled();
+  if (new_password_sync_enabled != password_sync_enabled_ ||
+      new_renderer) {
+    password_sync_enabled_ = new_password_sync_enabled;
+    SendPasswordSyncStateToRenderer(host, password_sync_enabled_);
+  }
+}
+
 void AutofillManager::SendPasswordGenerationStateToRenderer(
     content::RenderViewHost* host, bool enabled) {
   host->Send(new AutofillMsg_PasswordGenerationEnabled(host->GetRoutingID(),
                                                        enabled));
 }
 
 void AutofillManager::UpdatePasswordGenerationState(
-    content::RenderViewHost* host,
-    bool new_renderer) {
-  if (!sync_service_)
-    return;
-
-  // Password generation requires sync for passwords and the password manager
-  // to both be enabled.
-  syncable::ModelTypeSet sync_set = sync_service_->GetPreferredDataTypes();
-  bool password_sync_enabled = (sync_service_->HasSyncSetupCompleted() &&
-                                sync_set.Has(syncable::PASSWORDS));
+    content::RenderViewHost* host, bool new_renderer) {
+  Profile* profile = Profile::FromBrowserContext(
+      web_contents()->GetBrowserContext());
+  // Also need to check whether password manager is enabled.
   bool new_password_generation_enabled =
-      password_sync_enabled &&
+      profile->GetPrefs()->GetBoolean(prefs::kPasswordGenerationEnabled) &&

[Garrett Casto, 2012/04/26 23:23:59]

This should check if password sync is enabled as well.

       tab_contents_wrapper_->password_manager()->IsEnabled();
   if (new_password_generation_enabled != password_generation_enabled_ ||
       new_renderer) {
     password_generation_enabled_ = new_password_generation_enabled;
     SendPasswordGenerationStateToRenderer(host, password_generation_enabled_);
   }
 }
 
 void AutofillManager::RenderViewCreated(content::RenderViewHost* host) {
-      UpdatePasswordGenerationState(host, true);
+  UpdatePasswordSyncState(host, true);

[Garrett Casto, 2012/04/26 23:23:59]

This should just call UpdatePasswordGenerationState, not UpdatePasswordSyncState

+  UpdatePasswordGenerationState(host, true);
+}
+
+void AutofillManager::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  switch (type) {

[Garrett Casto, 2012/04/26 23:23:59]

I'm actually not totally sure that we need this observer. The password manager
for instance only checks if it's enabled/disabled when it's created.  Sync seems
different to me since if it's disabled, the feature will fail in a very bad way.
I guess since it's already here you can leave it.

[zysxqn, 2012/04/27 18:38:34]

I feel that it is useful since users sometimes expect to see the effect
immediately when they change some preference, so I added it like this. 

+    case chrome::NOTIFICATION_PREF_CHANGED: {
+      DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+      std::string* pref = content::Details<std::string>(details).ptr();
+      DCHECK(*pref == prefs::kPasswordGenerationEnabled);
+      UpdatePasswordGenerationState(web_contents()->GetRenderViewHost(), false);
+      break;
+    }
+    default:
+      NOTREACHED();
+  }
 }
 
 void AutofillManager::OnStateChanged() {
   // It is possible for sync state to change during tab contents destruction.
   // In this case, we don't need to update the renderer since it's going away.
   if (web_contents() && web_contents()->GetRenderViewHost()) {
-    UpdatePasswordGenerationState(web_contents()->GetRenderViewHost(),
+    UpdatePasswordSyncState(web_contents()->GetRenderViewHost(),

[Garrett Casto, 2012/04/26 23:23:59]

Don't change this.

                                   false);
   }
 }
 
 void AutofillManager::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   Reset();
 }
 
@@ skipping 549 matching lines @@
       personal_data_(personal_data),
       download_manager_(tab_contents->profile(), this),
       disable_download_manager_requests_(true),
       metric_logger_(new AutofillMetrics),
       has_logged_autofill_enabled_(false),
       has_logged_address_suggestions_count_(false),
       did_show_suggestions_(false),
       user_did_type_(false),
       user_did_autofill_(false),
       user_did_edit_autofilled_field_(false),
+      password_sync_enabled_(false),
       password_generation_enabled_(false),
       external_delegate_(NULL) {
   DCHECK(tab_contents);
   RegisterWithSyncService();
+  // Test code doens't need registrar_.
 }
 
 void AutofillManager::set_metric_logger(const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }
 
 bool AutofillManager::GetHost(const std::vector<AutofillProfile*>& profiles,
                               const std::vector<CreditCard*>& credit_cards,
                               RenderViewHost** host) const {
   if (!IsAutofillEnabled())
@@ skipping 471 matching lines @@
   *profile_guid = IDToGUID(profile_id);
 }
 
 void AutofillManager::UpdateInitialInteractionTimestamp(
     const TimeTicks& interaction_timestamp) {
   if (initial_interaction_timestamp_.is_null() ||
       interaction_timestamp < initial_interaction_timestamp_) {
     initial_interaction_timestamp_ = interaction_timestamp;
   }
 }