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

chrome/renderer/autofill/password_generation_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/renderer/autofill/password_generation_manager.h"
 
 #include "base/logging.h"
 #include "chrome/common/autofill_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "ui/gfx/rect.h"
 
 namespace autofill {
 
 PasswordGenerationManager::PasswordGenerationManager(
     content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
-      enabled_(false) {}
+      sync_enabled_(false),
+      password_generation_enabled_(false) {}
 PasswordGenerationManager::~PasswordGenerationManager() {}
 
 void PasswordGenerationManager::DidFinishDocumentLoad(WebKit::WebFrame* frame) {
-  // We don't want to generate passwords if the browser won't store or sync
-  // them.
-  if (!enabled_)
+  // We don't want to generate passwords if browser won't store or sync them, or
+  // password generation isn't enabled.
+  if (!sync_enabled_ || !password_generation_enabled_)
     return;
 
   if (!ShouldAnalyzeFrame(*frame))
     return;
 
   WebKit::WebVector<WebKit::WebFormElement> forms;
   frame->document().forms(forms);
   for (size_t i = 0; i < forms.size(); ++i) {
     const WebKit::WebFormElement& web_form = forms[i];
     if (!web_form.autoComplete())
@@ skipping 43 matching lines @@
     Send(new AutofillHostMsg_ShowPasswordGenerationPopup(routing_id(),
                                                          rect));
   }
 }
 
 bool PasswordGenerationManager::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PasswordGenerationManager, message)
     IPC_MESSAGE_HANDLER(AutofillMsg_GeneratedPasswordAccepted,
                         OnPasswordAccepted)
+    IPC_MESSAGE_HANDLER(AutofillMsg_PasswordSyncEnabled,
+                        OnPasswordSyncEnabled)
     IPC_MESSAGE_HANDLER(AutofillMsg_PasswordGenerationEnabled,
-                        OnPasswordSyncEnabled)
+                        OnPasswordGenerationEnabled)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PasswordGenerationManager::OnPasswordAccepted(const string16& password) {
   for (std::vector<WebKit::WebInputElement>::iterator it =
            account_creation_elements_.second.begin();
        it != account_creation_elements_.second.end(); ++it) {
     it->setValue(password);
     it->setAutofilled(true);
   }
 }
 
 void PasswordGenerationManager::OnPasswordSyncEnabled(bool enabled) {
-  enabled_ = enabled;
+  sync_enabled_ = enabled;
+}
+
+void PasswordGenerationManager::OnPasswordGenerationEnabled(bool enabled) {
+  password_generation_enabled_ = enabled;
 }
 
 }  // namespace autofill