| 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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 442 impl->historyForwardListCount() + 1; | 442 impl->historyForwardListCount() + 1; |
| 443 int pending_offset = offset + impl->history_list_offset_; | 443 int pending_offset = offset + impl->history_list_offset_; |
| 444 | 444 |
| 445 CommonNavigationParams common_params( | 445 CommonNavigationParams common_params( |
| 446 GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK, | 446 GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK, |
| 447 FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(), | 447 FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(), |
| 448 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL()); | 448 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL()); |
| 449 RequestNavigationParams request_params; | 449 RequestNavigationParams request_params; |
| 450 request_params.page_state = state; | 450 request_params.page_state = state; |
| 451 request_params.page_id = impl->page_id_ + offset; | 451 request_params.page_id = impl->page_id_ + offset; |
| 452 request_params.nav_entry_id = pending_offset + 1; |
| 452 request_params.pending_history_list_offset = pending_offset; | 453 request_params.pending_history_list_offset = pending_offset; |
| 453 request_params.current_history_list_offset = impl->history_list_offset_; | 454 request_params.current_history_list_offset = impl->history_list_offset_; |
| 454 request_params.current_history_list_length = history_list_length; | 455 request_params.current_history_list_length = history_list_length; |
| 455 | 456 |
| 456 impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(), | 457 impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(), |
| 457 request_params); | 458 request_params); |
| 458 | 459 |
| 459 // The load actually happens asynchronously, so we pump messages to process | 460 // The load actually happens asynchronously, so we pump messages to process |
| 460 // the pending continuation. | 461 // the pending continuation. |
| 461 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); | 462 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); |
| 462 } | 463 } |
| 463 | 464 |
| 464 } // namespace content | 465 } // namespace content |
| OLD | NEW |