Move AutoFill messages into a separate file.

chrome/renderer/autofill_helper.cc

 // Copyright (c) 2010 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_helper.h"
 
 #include "base/utf_string_conversions.h"
+#include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/render_messages.h"
 #include "chrome/renderer/form_manager.h"
 #include "chrome/renderer/password_autocomplete_manager.h"
 #include "chrome/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 28 matching lines @@
       display_warning_if_disabled_(false),
       was_query_node_autofilled_(false),
       suggestions_clear_index_(-1),
       suggestions_options_index_(-1),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
 bool AutoFillHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AutoFillHelper, message)
-    IPC_MESSAGE_HANDLER(ViewMsg_AutoFillSuggestionsReturned,
-                        OnSuggestionsReturned)
-    IPC_MESSAGE_HANDLER(ViewMsg_AutoFillFormDataFilled, OnFormDataFilled)
+    IPC_MESSAGE_HANDLER(AutoFillMsg_SuggestionsReturned, OnSuggestionsReturned)
+    IPC_MESSAGE_HANDLER(AutoFillMsg_FormDataFilled, OnFormDataFilled)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void AutoFillHelper::DidFinishDocumentLoad(WebKit::WebFrame* frame) {
   // The document has now been fully loaded.  Scan for forms to be sent up to
   // the browser.
   form_manager_.ExtractForms(frame);
   SendForms(frame);
@@ skipping 21 matching lines @@
 }
 
 void AutoFillHelper::didAcceptAutoFillSuggestion(const WebKit::WebNode& node,
                                              const WebKit::WebString& value,
                                              const WebKit::WebString& label,
                                              int unique_id,
                                              unsigned index) {
   if (suggestions_options_index_ != -1 &&
       index == static_cast<unsigned>(suggestions_options_index_)) {
     // User selected 'AutoFill Options'.
-    Send(new ViewHostMsg_ShowAutoFillDialog(routing_id()));
+    Send(new AutoFillHostMsg_ShowAutoFillDialog(routing_id()));
   } else if (suggestions_clear_index_ != -1 &&
              index == static_cast<unsigned>(suggestions_clear_index_)) {
     // User selected 'Clear form'.
     form_manager_.ClearFormWithNode(node);
   } else if (!unique_id) {
     // User selected an Autocomplete entry, so we fill directly.
     WebInputElement element = node.toConst<WebInputElement>();
 
     string16 substring = value;
     substring = substring.substr(0, element.maxLength());
@@ skipping 29 matching lines @@
 
 void AutoFillHelper::removeAutocompleteSuggestion(
     const WebKit::WebString& name,
     const WebKit::WebString& value) {
   // The index of clear & options will have shifted down.
   if (suggestions_clear_index_ != -1)
     suggestions_clear_index_--;
   if (suggestions_options_index_ != -1)
     suggestions_options_index_--;
 
-  Send(new ViewHostMsg_RemoveAutocompleteEntry(routing_id(), name, value));
+  Send(new AutoFillHostMsg_RemoveAutocompleteEntry(routing_id(), name, value));
 }
 
 void AutoFillHelper::textFieldDidEndEditing(
     const WebKit::WebInputElement& element) {
   password_autocomplete_manager_->TextFieldDidEndEditing(element);
 }
 
 void AutoFillHelper::textFieldDidChange(
     const WebKit::WebInputElement& element) {
   // We post a task for doing the AutoFill as the caret position is not set
@@ skipping 92 matching lines @@
     suggestions_options_index_ = v.size() - 1;
     separator_index = values.size();
   }
 
   // Send to WebKit for display.
   if (!v.empty() && autofill_query_node_.hasNonEmptyBoundingBox()) {
     web_view->applyAutoFillSuggestions(
         autofill_query_node_, v, l, i, ids, separator_index);
   }
 
-  Send(new ViewHostMsg_DidShowAutoFillSuggestions(routing_id()));
+  Send(new AutoFillHostMsg_DidShowAutoFillSuggestions(routing_id()));
 }
 
 void AutoFillHelper::OnFormDataFilled(
     int query_id, const webkit_glue::FormData& form) {
   if (!render_view()->webview() || query_id != autofill_query_id_)
     return;
 
   switch (autofill_action_) {
     case AUTOFILL_FILL:
       form_manager_.FillForm(form, autofill_query_node_);
       break;
     case AUTOFILL_PREVIEW:
       form_manager_.PreviewForm(form, autofill_query_node_);
       break;
     default:
       NOTREACHED();
   }
   autofill_action_ = AUTOFILL_NONE;
-  Send(new ViewHostMsg_DidFillAutoFillFormData(routing_id()));
+  Send(new AutoFillHostMsg_DidFillAutoFillFormData(routing_id()));
 }
 
 void AutoFillHelper::ShowSuggestions(const WebInputElement& element,
                                      bool autofill_on_empty_values,
                                      bool requires_caret_at_end,
                                      bool display_warning_if_disabled) {
   if (!element.isEnabledFormControl() || !element.isTextField() ||
       element.isPasswordField() || element.isReadOnly() ||
       !element.autoComplete())
     return;
@@ skipping 28 matching lines @@
   webkit_glue::FormData form;
   webkit_glue::FormField field;
   if (!FindFormAndFieldForNode(node, &form, &field)) {
     // If we didn't find the cached form, at least let autocomplete have a shot
     // at providing suggestions.
     FormManager::WebFormControlElementToFormField(
         node.toConst<WebFormControlElement>(), FormManager::EXTRACT_VALUE,
         &field);
   }
 
-  Send(new ViewHostMsg_QueryFormFieldAutoFill(
+  Send(new AutoFillHostMsg_QueryFormFieldAutoFill(
       routing_id(), autofill_query_id_, form, field));
 }
 
 void AutoFillHelper::FillAutoFillFormData(const WebNode& node,
                                            int unique_id,
                                            AutoFillAction action) {
   static int query_counter = 0;
   autofill_query_id_ = query_counter++;
 
   webkit_glue::FormData form;
   webkit_glue::FormField field;
   if (!FindFormAndFieldForNode(node, &form, &field))
     return;
 
   autofill_action_ = action;
   was_query_node_autofilled_ = field.is_autofilled();
-  Send(new ViewHostMsg_FillAutoFillFormData(
+  Send(new AutoFillHostMsg_FillAutoFillFormData(
       routing_id(), autofill_query_id_, form, field, unique_id));
 }
 
 void AutoFillHelper::SendForms(WebFrame* frame) {
   // TODO(jhawkins): Use FormManager once we have strict ordering of form
   // control elements in the cache.
   WebKit::WebVector<WebFormElement> web_forms;
   frame->forms(web_forms);
 
   std::vector<webkit_glue::FormData> forms;
   for (size_t i = 0; i < web_forms.size(); ++i) {
     const WebFormElement& web_form = web_forms[i];
 
     webkit_glue::FormData form;
     if (FormManager::WebFormElementToFormData(
             web_form, FormManager::REQUIRE_NONE,
             FormManager::EXTRACT_NONE, &form)) {
       forms.push_back(form);
     }
   }
 
   if (!forms.empty())
-    Send(new ViewHostMsg_FormsSeen(routing_id(), forms));
+    Send(new AutoFillHostMsg_FormsSeen(routing_id(), forms));
 }
 
 bool AutoFillHelper::FindFormAndFieldForNode(const WebNode& node,
                                              webkit_glue::FormData* form,
                                              webkit_glue::FormField* field) {
   const WebInputElement& element = node.toConst<WebInputElement>();
   if (!form_manager_.FindFormWithFormControlElement(element,
                                                     FormManager::REQUIRE_NONE,
                                                     form))
     return false;
 
   FormManager::WebFormControlElementToFormField(element,
                                                 FormManager::EXTRACT_VALUE,
                                                 field);
 
   // WebFormControlElementToFormField does not scrape the DOM for the field
   // label, so find the label here.
   // TODO(jhawkins): Add form and field identities so we can use the cached form
   // data in FormManager.
   field->set_label(FormManager::LabelForElement(element));
 
   return true;
 }