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 3326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3337 | 3337 |
3338 void RenderView::didFinishLoad(WebFrame* frame) { | 3338 void RenderView::didFinishLoad(WebFrame* frame) { |
3339 WebDataSource* ds = frame->dataSource(); | 3339 WebDataSource* ds = frame->dataSource(); |
3340 NavigationState* navigation_state = NavigationState::FromDataSource(ds); | 3340 NavigationState* navigation_state = NavigationState::FromDataSource(ds); |
3341 DCHECK(navigation_state); | 3341 DCHECK(navigation_state); |
3342 navigation_state->set_finish_load_time(Time::Now()); | 3342 navigation_state->set_finish_load_time(Time::Now()); |
3343 navigation_state->user_script_idle_scheduler()->DidFinishLoad(); | 3343 navigation_state->user_script_idle_scheduler()->DidFinishLoad(); |
3344 | 3344 |
3345 // Let the password manager know which password forms are actually visible. | 3345 // Let the password manager know which password forms are actually visible. |
3346 password_autocomplete_manager_->SendPasswordForms(frame, true); | 3346 password_autocomplete_manager_->SendPasswordForms(frame, true); |
| 3347 |
| 3348 Send(new ViewHostMsg_DidFinishLoad(routing_id_, frame->identifier())); |
3347 } | 3349 } |
3348 | 3350 |
3349 void RenderView::didNavigateWithinPage( | 3351 void RenderView::didNavigateWithinPage( |
3350 WebFrame* frame, bool is_new_navigation) { | 3352 WebFrame* frame, bool is_new_navigation) { |
3351 // Determine if the UserScriptIdleScheduler already ran scripts on this page, | 3353 // Determine if the UserScriptIdleScheduler already ran scripts on this page, |
3352 // since a new one gets created by didCreateDataSource. | 3354 // since a new one gets created by didCreateDataSource. |
3353 NavigationState* state = NavigationState::FromDataSource(frame->dataSource()); | 3355 NavigationState* state = NavigationState::FromDataSource(frame->dataSource()); |
3354 bool idle_scheduler_ran = state->user_script_idle_scheduler()->has_run(); | 3356 bool idle_scheduler_ran = state->user_script_idle_scheduler()->has_run(); |
3355 | 3357 |
3356 // If this was a reference fragment navigation that we initiated, then we | 3358 // If this was a reference fragment navigation that we initiated, then we |
(...skipping 2762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6119 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), | 6121 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), |
6120 message_id); | 6122 message_id); |
6121 } | 6123 } |
6122 | 6124 |
6123 #if defined(OS_MACOSX) | 6125 #if defined(OS_MACOSX) |
6124 void RenderView::OnSelectPopupMenuItem(int selected_index) { | 6126 void RenderView::OnSelectPopupMenuItem(int selected_index) { |
6125 external_popup_menu_->DidSelectItem(selected_index); | 6127 external_popup_menu_->DidSelectItem(selected_index); |
6126 external_popup_menu_.reset(); | 6128 external_popup_menu_.reset(); |
6127 } | 6129 } |
6128 #endif | 6130 #endif |
OLD | NEW |