Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: content/public/test/render_view_test.cc

Issue 148083013: Move browser initiated navigation from RenderViewHost to RenderFrameHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another one bites the dust. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 320
321 void RenderViewTest::ClearHistory() { 321 void RenderViewTest::ClearHistory() {
322 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); 322 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
323 impl->page_id_ = -1; 323 impl->page_id_ = -1;
324 impl->history_list_offset_ = -1; 324 impl->history_list_offset_ = -1;
325 impl->history_list_length_ = 0; 325 impl->history_list_length_ = 0;
326 impl->history_page_ids_.clear(); 326 impl->history_page_ids_.clear();
327 } 327 }
328 328
329 void RenderViewTest::Reload(const GURL& url) { 329 void RenderViewTest::Reload(const GURL& url) {
330 ViewMsg_Navigate_Params params; 330 FrameMsg_Navigate_Params params;
331 params.url = url; 331 params.url = url;
332 params.navigation_type = ViewMsg_Navigate_Type::RELOAD; 332 params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
333 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); 333 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
334 impl->OnNavigate(params); 334 impl->main_render_frame()->OnNavigate(params);
335 } 335 }
336 336
337 uint32 RenderViewTest::GetNavigationIPCType() { 337 uint32 RenderViewTest::GetNavigationIPCType() {
338 return FrameHostMsg_DidCommitProvisionalLoad::ID; 338 return FrameHostMsg_DidCommitProvisionalLoad::ID;
339 } 339 }
340 340
341 void RenderViewTest::Resize(gfx::Size new_size, 341 void RenderViewTest::Resize(gfx::Size new_size,
342 gfx::Rect resizer_rect, 342 gfx::Rect resizer_rect,
343 bool is_fullscreen) { 343 bool is_fullscreen) {
344 ViewMsg_Resize_Params params; 344 ViewMsg_Resize_Params params;
(...skipping 29 matching lines...) Expand all
374 } 374 }
375 375
376 void RenderViewTest::GoToOffset(int offset, 376 void RenderViewTest::GoToOffset(int offset,
377 const blink::WebHistoryItem& history_item) { 377 const blink::WebHistoryItem& history_item) {
378 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); 378 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
379 379
380 int history_list_length = impl->historyBackListCount() + 380 int history_list_length = impl->historyBackListCount() +
381 impl->historyForwardListCount() + 1; 381 impl->historyForwardListCount() + 1;
382 int pending_offset = offset + impl->history_list_offset(); 382 int pending_offset = offset + impl->history_list_offset();
383 383
384 ViewMsg_Navigate_Params navigate_params; 384 FrameMsg_Navigate_Params navigate_params;
385 navigate_params.navigation_type = ViewMsg_Navigate_Type::NORMAL; 385 navigate_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
386 navigate_params.transition = PAGE_TRANSITION_FORWARD_BACK; 386 navigate_params.transition = PAGE_TRANSITION_FORWARD_BACK;
387 navigate_params.current_history_list_length = history_list_length; 387 navigate_params.current_history_list_length = history_list_length;
388 navigate_params.current_history_list_offset = impl->history_list_offset(); 388 navigate_params.current_history_list_offset = impl->history_list_offset();
389 navigate_params.pending_history_list_offset = pending_offset; 389 navigate_params.pending_history_list_offset = pending_offset;
390 navigate_params.page_id = impl->GetPageId() + offset; 390 navigate_params.page_id = impl->GetPageId() + offset;
391 navigate_params.page_state = HistoryItemToPageState(history_item); 391 navigate_params.page_state = HistoryItemToPageState(history_item);
392 navigate_params.request_time = base::Time::Now(); 392 navigate_params.request_time = base::Time::Now();
393 393
394 ViewMsg_Navigate navigate_message(impl->GetRoutingID(), navigate_params); 394 FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(),
395 OnMessageReceived(navigate_message); 395 navigate_params);
396 impl->main_render_frame()->OnMessageReceived(navigate_message);
396 397
397 // The load actually happens asynchronously, so we pump messages to process 398 // The load actually happens asynchronously, so we pump messages to process
398 // the pending continuation. 399 // the pending continuation.
399 ProcessPendingMessages(); 400 ProcessPendingMessages();
400 } 401 }
401 402
402 } // namespace content 403 } // namespace content
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | content/renderer/accessibility/renderer_accessibility_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698