Only enable password generation if password manager and autofill are both

chrome/browser/autofill/autofill_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 97 matching lines @@
 
   // Returns the value of the AutofillEnabled pref.
   virtual bool IsAutofillEnabled() const;
 
   // Uploads the form data to the Autofill server.
   virtual void UploadFormData(const FormStructure& submitted_form);
 
   // Reset cache.
   void Reset();
 
-  // Informs the renderers of the current password sync state for use in
+  // Informs the renderer of the current password sync state for use in
   // password generation. This is a separate function to aid with testing.

[Ilya Sherman, 2012/04/24 00:46:54]

nit: Should the reference to "sync" in this comment also be updated?

[Garrett Casto, 2012/04/24 18:49:56]

Done.

-  virtual void SendPasswordSyncStateToRenderer(content::RenderViewHost* host,
-                                               bool enabled);
+  virtual void SendPasswordGenerationStateToRenderer(
+      content::RenderViewHost* host,
+      bool enabled);
 
   // Logs quality metrics for the |submitted_form| and uploads the form data
   // to the crowdsourcing server, if appropriate.
   virtual void UploadFormDataAsyncCallback(
       const FormStructure* submitted_form,
       const base::TimeTicks& load_time,
       const base::TimeTicks& interaction_time,
       const base::TimeTicks& submission_time);
 
   // Maps GUIDs to and from IDs that are used to identify profiles and credit
@@ skipping 33 matching lines @@
   // AutofillDownloadManager::Observer:
   virtual void OnLoadedServerPredictions(
       const std::string& response_xml) OVERRIDE;
 
   // ProfileSyncServiceObserver:
   virtual void OnStateChanged() OVERRIDE;
 
   // Register as an observer with the sync service.
   void RegisterWithSyncService();
 
-  // Determines what the current state of password sync is, and if it has
-  // changed from password_sync_enabled_. If it has changed or if
+  // Determines what the current state of password generation is, and if it has
+  // changed from password_generation_enabled_. If it has changed or if

[Ilya Sherman, 2012/04/24 00:46:54]

nit: password_generation_enabled_ -> |password_generation_enabled_|

[Garrett Casto, 2012/04/24 18:49:56]

Done.

   // |new_renderer| is true, it notifies the renderer of this change via
-  // SendPasswordSyncStateToRenderer.
-  void UpdatePasswordSyncState(content::RenderViewHost* host,
-                               bool new_renderer);
+  // SendPasswordGenerationStateToRenderer.
+  void UpdatePasswordGenerationState(content::RenderViewHost* host,
+                                     bool new_renderer);
 
   void OnFormsSeen(const std::vector<webkit::forms::FormData>& forms,
                    const base::TimeTicks& timestamp);
   void OnTextFieldDidChange(const webkit::forms::FormData& form,
                             const webkit::forms::FormField& field,
                             const base::TimeTicks& timestamp);
 
   // The |bounding_box| is a window relative value.
   void OnQueryFormFieldAutofill(int query_id,
                                 const webkit::forms::FormData& form,
@@ skipping 138 matching lines @@
   bool user_did_type_;
   // Has the user autofilled a form on this page?
   bool user_did_autofill_;
   // Has the user edited a field that was previously autofilled?
   bool user_did_edit_autofilled_field_;
   // When the page finished loading.
   base::TimeTicks forms_loaded_timestamp_;
   // When the user first interacted with a potentially fillable form on this
   // page.
   base::TimeTicks initial_interaction_timestamp_;
-  // If password sync is enabled. We cache this value so that we don't
+  // If password generation is enabled. We cache this value so that we don't
   // spam the renderer with messages during startup when the sync state
   // is changing rapidly.
-  bool password_sync_enabled_;
+  bool password_generation_enabled_;
   // The ProfileSyncService associated with this tab. This may be NULL in
   // testing.
   base::WeakPtr<ProfileSyncService> sync_service_;
 
   // Our copy of the form data.
   ScopedVector<FormStructure> form_structures_;
 
   // GUID to ID mapping.  We keep two maps to convert back and forth.
   mutable std::map<GUIDPair, int> guid_id_map_;
   mutable std::map<int, GUIDPair> id_guid_map_;
@@ skipping 21 matching lines @@
                            TestTabContentsWithExternalDelegate);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest,
                            UserHappinessFormLoadAndSubmission);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, UserHappinessFormInteraction);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, FormFillDuration);
 
   DISALLOW_COPY_AND_ASSIGN(AutofillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_