Only enable password generation if password manager and autofill are both

chrome/browser/autofill/autofill_manager.h

Index: chrome/browser/autofill/autofill_manager.h
diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h
index 8278ca73e0a482ba4d1eda59c55c2e91996e39f4..380ef5f264cef089cfdcd6a86c1229f584a74683 100644
--- a/chrome/browser/autofill/autofill_manager.h
+++ b/chrome/browser/autofill/autofill_manager.h
@@ -115,10 +115,11 @@ class AutofillManager : public content::WebContentsObserver,
   // 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.
@@ -172,12 +173,12 @@ class AutofillManager : public content::WebContentsObserver,
   // 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);
@@ -336,10 +337,10 @@ class AutofillManager : public content::WebContentsObserver,
   // 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_;