Refactor PasswordAutofillAgent: methods to functions.

components/autofill/content/renderer/password_autofill_agent.h

 // Copyright 2013 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 COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
 #define COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
 
 #include <map>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 
 namespace blink {
 class WebInputElement;
 class WebKeyboardEvent;
 class WebSecurityOrigin;
 class WebView;
 }
 
 namespace autofill {
 
 // This class is responsible for filling password forms.
 // There is one PasswordAutofillAgent per RenderView.
 class PasswordAutofillAgent : public content::RenderViewObserver {
  public:
+  enum OtherPossibleUsernamesUsage {

[vabr (Chromium), 2014/09/26 10:06:48]

Please keep this private, not public.

Instead, use the return value of the 3 moved functions to indicate whether or
not other possible usernames were shown/selected. Also please document that
meaning of the return value.

+    NOTHING_TO_AUTOFILL,
+    OTHER_POSSIBLE_USERNAMES_ABSENT,
+    OTHER_POSSIBLE_USERNAMES_PRESENT,
+    OTHER_POSSIBLE_USERNAME_SHOWN,
+    OTHER_POSSIBLE_USERNAME_SELECTED,
+    OTHER_POSSIBLE_USERNAMES_MAX
+  };
   explicit PasswordAutofillAgent(content::RenderView* render_view);
   virtual ~PasswordAutofillAgent();
 
   // WebViewClient editor related calls forwarded by the RenderView.
   // If they return true, it indicates the event was consumed and should not
   // be used for any other autofill activity.
   bool TextFieldDidEndEditing(const blink::WebInputElement& element);
   bool TextDidChangeInTextField(const blink::WebInputElement& element);
   bool TextFieldHandlingKeyDown(const blink::WebInputElement& element,
                                 const blink::WebKeyboardEvent& event);
@@ skipping 26 matching lines @@
   // Called when the user first interacts with the page after a load. This is a
   // signal to make autofilled values of password input elements accessible to
   // JavaScript.
   void FirstUserGestureObserved();
 
  protected:
   virtual bool OriginCanAccessPasswordManager(
       const blink::WebSecurityOrigin& origin);
 
  private:
-  enum OtherPossibleUsernamesUsage {
-    NOTHING_TO_AUTOFILL,
-    OTHER_POSSIBLE_USERNAMES_ABSENT,
-    OTHER_POSSIBLE_USERNAMES_PRESENT,
-    OTHER_POSSIBLE_USERNAME_SHOWN,
-    OTHER_POSSIBLE_USERNAME_SELECTED,
-    OTHER_POSSIBLE_USERNAMES_MAX
-  };
-
   // Ways to restrict which passwords are saved in ProvisionallySavePassword.
   enum ProvisionallySaveRestriction {
     RESTRICTION_NONE,
     RESTRICTION_NON_EMPTY_PASSWORD
   };
 
   struct PasswordInfo {
     blink::WebInputElement password_field;
     PasswordFormFillData fill_data;
     bool backspace_pressed_last;
@@ skipping 51 matching lines @@
                               const blink::WebFormElement& form) OVERRIDE;
 
   // RenderView IPC handlers:
   void OnFillPasswordForm(const PasswordFormFillData& form_data);
   void OnSetLoggingState(bool active);
 
   // Scans the given frame for password forms and sends them up to the browser.
   // If |only_visible| is true, only forms visible in the layout are sent.
   void SendPasswordForms(blink::WebFrame* frame, bool only_visible);
 
-  void GetSuggestions(const PasswordFormFillData& fill_data,
-                      const base::string16& input,
-                      std::vector<base::string16>* suggestions,
-                      std::vector<base::string16>* realms,
-                      bool show_all);
-
   bool ShowSuggestionPopup(const PasswordFormFillData& fill_data,
                            const blink::WebInputElement& user_input,
                            bool show_all);
 
-  // Attempts to fill |username_element| and |password_element| with the
-  // |fill_data|.  Will use the data corresponding to the preferred username,
-  // unless the |username_element| already has a value set.  In that case,
-  // attempts to fill the password matching the already filled username, if
-  // such a password exists.
-  void FillFormOnPasswordRecieved(const PasswordFormFillData& fill_data,
-                                  blink::WebInputElement username_element,
-                                  blink::WebInputElement password_element);
-
-  bool FillUserNameAndPassword(blink::WebInputElement* username_element,
-                               blink::WebInputElement* password_element,
-                               const PasswordFormFillData& fill_data,
-                               bool exact_username_match,
-                               bool set_selection);
 
   // Fills |login_input| and |password| with the most relevant suggestion from
   // |fill_data| and shows a popup with other suggestions.
   void PerformInlineAutocomplete(
       const blink::WebInputElement& username,
       const blink::WebInputElement& password,
       const PasswordFormFillData& fill_data);
 
   // Invoked when the passed frame is closing.  Gives us a chance to clear any
   // reference we may have to elements in that frame.
@@ skipping 53 matching lines @@
   bool did_stop_loading_;
 
   base::WeakPtrFactory<PasswordAutofillAgent> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordAutofillAgent);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_