OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/public/test/render_view_test.h" | 5 #include "content/public/test/render_view_test.h" |
6 | 6 |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "content/common/dom_storage/dom_storage_types.h" | 8 #include "content/common/dom_storage/dom_storage_types.h" |
9 #include "content/common/frame_messages.h" | 9 #include "content/common/frame_messages.h" |
10 #include "content/common/input_messages.h" | 10 #include "content/common/input_messages.h" |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
445 impl->historyForwardListCount() + 1; | 445 impl->historyForwardListCount() + 1; |
446 int pending_offset = offset + impl->history_list_offset_; | 446 int pending_offset = offset + impl->history_list_offset_; |
447 | 447 |
448 CommonNavigationParams common_params( | 448 CommonNavigationParams common_params( |
449 GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK, | 449 GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK, |
450 FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(), | 450 FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(), |
451 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL()); | 451 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL()); |
452 RequestNavigationParams request_params; | 452 RequestNavigationParams request_params; |
453 request_params.page_state = state; | 453 request_params.page_state = state; |
454 request_params.page_id = impl->page_id_ + offset; | 454 request_params.page_id = impl->page_id_ + offset; |
| 455 request_params.nav_entry_id = pending_offset + 1; |
455 request_params.pending_history_list_offset = pending_offset; | 456 request_params.pending_history_list_offset = pending_offset; |
456 request_params.current_history_list_offset = impl->history_list_offset_; | 457 request_params.current_history_list_offset = impl->history_list_offset_; |
457 request_params.current_history_list_length = history_list_length; | 458 request_params.current_history_list_length = history_list_length; |
458 | 459 |
459 impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(), | 460 impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(), |
460 request_params); | 461 request_params); |
461 | 462 |
462 // The load actually happens asynchronously, so we pump messages to process | 463 // The load actually happens asynchronously, so we pump messages to process |
463 // the pending continuation. | 464 // the pending continuation. |
464 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); | 465 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); |
465 } | 466 } |
466 | 467 |
467 } // namespace content | 468 } // namespace content |
OLD | NEW |