OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/renderer/autofill_helper.h" | 5 #include "chrome/renderer/autofill_helper.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "chrome/renderer/form_manager.h" | 8 #include "chrome/renderer/form_manager.h" |
9 #include "chrome/renderer/render_view.h" | 9 #include "chrome/renderer/render_view.h" |
10 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 } else { | 179 } else { |
180 // Fill the values for the whole form. | 180 // Fill the values for the whole form. |
181 QueryAutoFillFormData(node, value, label, unique_id, AUTOFILL_FILL); | 181 QueryAutoFillFormData(node, value, label, unique_id, AUTOFILL_FILL); |
182 } | 182 } |
183 | 183 |
184 suggestions_clear_index_ = -1; | 184 suggestions_clear_index_ = -1; |
185 suggestions_options_index_ = -1; | 185 suggestions_options_index_ = -1; |
186 } | 186 } |
187 | 187 |
188 void AutoFillHelper::DidClearAutoFillSelection(const WebNode& node) { | 188 void AutoFillHelper::DidClearAutoFillSelection(const WebNode& node) { |
189 webkit_glue::FormData form; | 189 form_manager_.ClearPreviewedFormWithNode(node); |
190 const WebFormControlElement element = node.toConst<WebFormControlElement>(); | |
191 if (!form_manager_.FindFormWithFormControlElement( | |
192 element, FormManager::REQUIRE_NONE, &form)) { | |
193 return; | |
194 } | |
195 form_manager_.ClearPreviewedForm(form); | |
196 } | 190 } |
197 | 191 |
198 void AutoFillHelper::FrameContentsAvailable(WebFrame* frame) { | 192 void AutoFillHelper::FrameContentsAvailable(WebFrame* frame) { |
199 form_manager_.ExtractForms(frame); | 193 form_manager_.ExtractForms(frame); |
200 SendForms(frame); | 194 SendForms(frame); |
201 } | 195 } |
202 | 196 |
203 void AutoFillHelper::FrameWillClose(WebFrame* frame) { | 197 void AutoFillHelper::FrameWillClose(WebFrame* frame) { |
204 form_manager_.ResetFrame(frame); | 198 form_manager_.ResetFrame(frame); |
205 } | 199 } |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 web_form, FormManager::REQUIRE_NONE, false, &form)) { | 233 web_form, FormManager::REQUIRE_NONE, false, &form)) { |
240 forms.push_back(form); | 234 forms.push_back(form); |
241 } | 235 } |
242 } | 236 } |
243 | 237 |
244 if (!forms.empty()) { | 238 if (!forms.empty()) { |
245 render_view_->Send(new ViewHostMsg_FormsSeen(render_view_->routing_id(), | 239 render_view_->Send(new ViewHostMsg_FormsSeen(render_view_->routing_id(), |
246 forms)); | 240 forms)); |
247 } | 241 } |
248 } | 242 } |
OLD | NEW |