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/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2953 PasswordForm* old_form_data = old_navigation_state->password_form_data(); | 2953 PasswordForm* old_form_data = old_navigation_state->password_form_data(); |
2954 if (old_form_data && old_form_data->action == password_form_data->action) | 2954 if (old_form_data && old_form_data->action == password_form_data->action) |
2955 password_form_data->password_value = old_form_data->password_value; | 2955 password_form_data->password_value = old_form_data->password_value; |
2956 } | 2956 } |
2957 } | 2957 } |
2958 | 2958 |
2959 FormData form_data; | 2959 FormData form_data; |
2960 if (FormManager::WebFormElementToFormData( | 2960 if (FormManager::WebFormElementToFormData( |
2961 form, | 2961 form, |
2962 FormManager::REQUIRE_AUTOCOMPLETE, | 2962 FormManager::REQUIRE_AUTOCOMPLETE, |
2963 FormManager::EXTRACT_VALUE, | 2963 static_cast<FormManager::ExtractMask>(FormManager::EXTRACT_VALUE | |
| 2964 FormManager::EXTRACT_OPTION_TEXT), |
2964 &form_data)) { | 2965 &form_data)) { |
2965 Send(new ViewHostMsg_FormSubmitted(routing_id_, form_data)); | 2966 Send(new ViewHostMsg_FormSubmitted(routing_id_, form_data)); |
2966 } | 2967 } |
2967 } | 2968 } |
2968 | 2969 |
2969 void RenderView::willPerformClientRedirect( | 2970 void RenderView::willPerformClientRedirect( |
2970 WebFrame* frame, const WebURL& from, const WebURL& to, double interval, | 2971 WebFrame* frame, const WebURL& from, const WebURL& to, double interval, |
2971 double fire_time) { | 2972 double fire_time) { |
2972 // Ignore | 2973 // Ignore |
2973 } | 2974 } |
(...skipping 2514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5488 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), | 5489 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), |
5489 message_id); | 5490 message_id); |
5490 } | 5491 } |
5491 | 5492 |
5492 #if defined(OS_MACOSX) | 5493 #if defined(OS_MACOSX) |
5493 void RenderView::OnSelectPopupMenuItem(int selected_index) { | 5494 void RenderView::OnSelectPopupMenuItem(int selected_index) { |
5494 external_popup_menu_->DidSelectItem(selected_index); | 5495 external_popup_menu_->DidSelectItem(selected_index); |
5495 external_popup_menu_.reset(); | 5496 external_popup_menu_.reset(); |
5496 } | 5497 } |
5497 #endif | 5498 #endif |
OLD | NEW |