| Index: components/autofill/content/renderer/autofill_agent.h
|
| diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h
|
| index 3f979bf95b38a4c9aca5c2d386479d9d9bb727f4..1f25703a3aaf460171cd1b50296c81ee53052f02 100644
|
| --- a/components/autofill/content/renderer/autofill_agent.h
|
| +++ b/components/autofill/content/renderer/autofill_agent.h
|
| @@ -21,7 +21,7 @@
|
| #include "third_party/WebKit/public/web/WebFormElement.h"
|
| #include "third_party/WebKit/public/web/WebInputElement.h"
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebNode;
|
| class WebView;
|
| }
|
| @@ -43,7 +43,7 @@ class PasswordAutofillAgent;
|
|
|
| class AutofillAgent : public content::RenderViewObserver,
|
| public PageClickListener,
|
| - public WebKit::WebAutofillClient {
|
| + public blink::WebAutofillClient {
|
| public:
|
| // PasswordAutofillAgent is guaranteed to outlive AutofillAgent.
|
| AutofillAgent(content::RenderView* render_view,
|
| @@ -59,38 +59,38 @@ class AutofillAgent : public content::RenderViewObserver,
|
|
|
| // RenderView::Observer:
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
| - virtual void DidFinishDocumentLoad(WebKit::WebFrame* frame) OVERRIDE;
|
| - virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame,
|
| + virtual void DidFinishDocumentLoad(blink::WebFrame* frame) OVERRIDE;
|
| + virtual void DidCommitProvisionalLoad(blink::WebFrame* frame,
|
| bool is_new_navigation) OVERRIDE;
|
| - virtual void FrameDetached(WebKit::WebFrame* frame) OVERRIDE;
|
| - virtual void WillSubmitForm(WebKit::WebFrame* frame,
|
| - const WebKit::WebFormElement& form) OVERRIDE;
|
| + virtual void FrameDetached(blink::WebFrame* frame) OVERRIDE;
|
| + virtual void WillSubmitForm(blink::WebFrame* frame,
|
| + const blink::WebFormElement& form) OVERRIDE;
|
| virtual void ZoomLevelChanged() OVERRIDE;
|
| - virtual void DidChangeScrollOffset(WebKit::WebFrame* frame) OVERRIDE;
|
| - virtual void FocusedNodeChanged(const WebKit::WebNode& node) OVERRIDE;
|
| + virtual void DidChangeScrollOffset(blink::WebFrame* frame) OVERRIDE;
|
| + virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE;
|
| virtual void OrientationChangeEvent(int orientation) OVERRIDE;
|
|
|
| // PageClickListener:
|
| - virtual void InputElementClicked(const WebKit::WebInputElement& element,
|
| + virtual void InputElementClicked(const blink::WebInputElement& element,
|
| bool was_focused,
|
| bool is_focused) OVERRIDE;
|
| virtual void InputElementLostFocus() OVERRIDE;
|
|
|
| - // WebKit::WebAutofillClient:
|
| - virtual void didClearAutofillSelection(const WebKit::WebNode& node) OVERRIDE;
|
| + // blink::WebAutofillClient:
|
| + virtual void didClearAutofillSelection(const blink::WebNode& node) OVERRIDE;
|
| virtual void textFieldDidEndEditing(
|
| - const WebKit::WebInputElement& element) OVERRIDE;
|
| + const blink::WebInputElement& element) OVERRIDE;
|
| virtual void textFieldDidChange(
|
| - const WebKit::WebInputElement& element) OVERRIDE;
|
| + const blink::WebInputElement& element) OVERRIDE;
|
| virtual void textFieldDidReceiveKeyDown(
|
| - const WebKit::WebInputElement& element,
|
| - const WebKit::WebKeyboardEvent& event) OVERRIDE;
|
| + const blink::WebInputElement& element,
|
| + const blink::WebKeyboardEvent& event) OVERRIDE;
|
| virtual void didRequestAutocomplete(
|
| - WebKit::WebFrame* frame,
|
| - const WebKit::WebFormElement& form) OVERRIDE;
|
| + blink::WebFrame* frame,
|
| + const blink::WebFormElement& form) OVERRIDE;
|
| virtual void setIgnoreTextChanges(bool ignore) OVERRIDE;
|
| virtual void didAssociateFormControls(
|
| - const WebKit::WebVector<WebKit::WebNode>& nodes) OVERRIDE;
|
| + const blink::WebVector<blink::WebNode>& nodes) OVERRIDE;
|
|
|
| void OnFormDataFilled(int query_id, const FormData& form);
|
| void OnFieldTypePredictionsAvailable(
|
| @@ -107,12 +107,12 @@ class AutofillAgent : public content::RenderViewObserver,
|
|
|
| // Called when interactive autocomplete finishes.
|
| void OnRequestAutocompleteResult(
|
| - WebKit::WebFormElement::AutocompleteResult result,
|
| + blink::WebFormElement::AutocompleteResult result,
|
| const FormData& form_data);
|
|
|
| // Called when an autocomplete request succeeds or fails with the |result|.
|
| void FinishAutocompleteRequest(
|
| - WebKit::WebFormElement::AutocompleteResult result);
|
| + blink::WebFormElement::AutocompleteResult result);
|
|
|
| // Called when the page is actually shown in the browser, as opposed to simply
|
| // being preloaded.
|
| @@ -120,7 +120,7 @@ class AutofillAgent : public content::RenderViewObserver,
|
|
|
| // Called in a posted task by textFieldDidChange() to work-around a WebKit bug
|
| // http://bugs.webkit.org/show_bug.cgi?id=16976
|
| - void TextFieldDidChangeImpl(const WebKit::WebInputElement& element);
|
| + void TextFieldDidChangeImpl(const blink::WebInputElement& element);
|
|
|
| // Shows the autofill suggestions for |element|.
|
| // This call is asynchronous and may or may not lead to the showing of a
|
| @@ -133,14 +133,14 @@ class AutofillAgent : public content::RenderViewObserver,
|
| // displayed to the user if Autofill has suggestions available, but cannot
|
| // fill them because it is disabled (e.g. when trying to fill a credit card
|
| // form on a non-secure website).
|
| - void ShowSuggestions(const WebKit::WebInputElement& element,
|
| + void ShowSuggestions(const blink::WebInputElement& element,
|
| bool autofill_on_empty_values,
|
| bool requires_caret_at_end,
|
| bool display_warning_if_disabled);
|
|
|
| // Queries the browser for Autocomplete and Autofill suggestions for the given
|
| // |element|.
|
| - void QueryAutofillSuggestions(const WebKit::WebInputElement& element,
|
| + void QueryAutofillSuggestions(const blink::WebInputElement& element,
|
| bool display_warning_if_disabled);
|
|
|
| // Sets the element value to reflect the selected |suggested_value|.
|
| @@ -150,19 +150,19 @@ class AutofillAgent : public content::RenderViewObserver,
|
| // |value| is the current text in the field, and |unique_id| is the selected
|
| // profile's unique ID. |action| specifies whether to Fill or Preview the
|
| // values returned from the AutofillManager.
|
| - void FillAutofillFormData(const WebKit::WebNode& node,
|
| + void FillAutofillFormData(const blink::WebNode& node,
|
| int unique_id,
|
| AutofillAction action);
|
|
|
| // Fills |form| and |field| with the FormData and FormField corresponding to
|
| // |node|. Returns true if the data was found; and false otherwise.
|
| bool FindFormAndFieldForNode(
|
| - const WebKit::WebNode& node,
|
| + const blink::WebNode& node,
|
| FormData* form,
|
| FormFieldData* field) WARN_UNUSED_RESULT;
|
|
|
| // Set |node| to display the given |value|.
|
| - void SetNodeText(const base::string16& value, WebKit::WebInputElement* node);
|
| + void SetNodeText(const base::string16& value, blink::WebInputElement* node);
|
|
|
| // Hides any currently showing Autofill UI.
|
| void HideAutofillUI();
|
| @@ -176,19 +176,19 @@ class AutofillAgent : public content::RenderViewObserver,
|
| int autofill_query_id_;
|
|
|
| // The element corresponding to the last request sent for form field Autofill.
|
| - WebKit::WebInputElement element_;
|
| + blink::WebInputElement element_;
|
|
|
| // The form element currently requesting an interactive autocomplete.
|
| - WebKit::WebFormElement in_flight_request_form_;
|
| + blink::WebFormElement in_flight_request_form_;
|
|
|
| // All the form elements seen in the top frame.
|
| - std::vector<WebKit::WebFormElement> form_elements_;
|
| + std::vector<blink::WebFormElement> form_elements_;
|
|
|
| // The action to take when receiving Autofill data from the AutofillManager.
|
| AutofillAction autofill_action_;
|
|
|
| // Pointer to the WebView. Used to access page scale factor.
|
| - WebKit::WebView* web_view_;
|
| + blink::WebView* web_view_;
|
|
|
| // Should we display a warning if autofill is disabled?
|
| bool display_warning_if_disabled_;
|
|
|