| Index: chrome/browser/renderer_host/render_view_host.h
|
| diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
|
| index efcf56cf166437b8cdbee91b842bf8c35d27e647..9732dd92877adcf3a9ef9f65f10d6b80afa4a818 100644
|
| --- a/chrome/browser/renderer_host/render_view_host.h
|
| +++ b/chrome/browser/renderer_host/render_view_host.h
|
| @@ -411,18 +411,18 @@ class RenderViewHost : public RenderWidgetHost {
|
| // set to false when creating a renderer-initiated window via window.open.
|
| void AllowScriptToClose(bool visible);
|
|
|
| + // Resets the stored AutoFill state.
|
| + void ResetAutoFillState(int query_id, bool autofill_disabled);
|
| +
|
| // Called by the AutoFillManager when the list of suggestions is ready.
|
| - void AutoFillSuggestionsReturned(
|
| - int query_id,
|
| - const std::vector<string16>& values,
|
| - const std::vector<string16>& labels,
|
| - const std::vector<string16>& icons,
|
| - const std::vector<int>& unique_ids);
|
| + void AutoFillSuggestionsReturned(const std::vector<string16>& values,
|
| + const std::vector<string16>& labels,
|
| + const std::vector<string16>& icons,
|
| + const std::vector<int>& unique_ids);
|
|
|
| // Called by the AutocompleteHistoryManager when the list of suggestions is
|
| // ready.
|
| void AutocompleteSuggestionsReturned(
|
| - int query_id,
|
| const std::vector<string16>& suggestions);
|
|
|
| // Called by the AutoFillManager when the FormData has been filled out.
|
| @@ -676,7 +676,8 @@ class RenderViewHost : public RenderWidgetHost {
|
| void OnMsgShouldCloseACK(bool proceed);
|
| void OnQueryFormFieldAutoFill(int request_id,
|
| bool form_autofilled,
|
| - const webkit_glue::FormField& field);
|
| + const webkit_glue::FormField& field,
|
| + bool autofill_disabled);
|
| void OnDidShowAutoFillSuggestions();
|
| void OnRemoveAutocompleteEntry(const string16& field_name,
|
| const string16& value);
|
| @@ -805,12 +806,15 @@ class RenderViewHost : public RenderWidgetHost {
|
| // what process type we use.
|
| bool is_extension_process_;
|
|
|
| + // TODO(isherman): Consider splitting these off into a helper class.
|
| // AutoFill and Autocomplete suggestions. We accumulate these separately and
|
| // send them back to the renderer together.
|
| std::vector<string16> autofill_values_;
|
| std::vector<string16> autofill_labels_;
|
| std::vector<string16> autofill_icons_;
|
| std::vector<int> autofill_unique_ids_;
|
| + bool autofill_disabled_;
|
| + int autofill_query_id_;
|
|
|
| // Whether the accessibility tree should be saved, for unit testing.
|
| bool save_accessibility_tree_for_testing_;
|
|
|