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

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 281663002: Create RenderFrameProxyHost at time of swap-out instead of commit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix IPC_BEGIN_MESSAGE_MAP macro, as _EX version doesn't exist anymore. Created 6 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/frame_host/interstitial_page_impl.h" 5 #include "content/browser/frame_host/interstitial_page_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 static_cast<WebContentsImpl*>(web_contents())->GetView(); 570 static_cast<WebContentsImpl*>(web_contents())->GetView();
571 RenderWidgetHostViewBase* view = 571 RenderWidgetHostViewBase* view =
572 wcv->CreateViewForWidget(render_view_host_); 572 wcv->CreateViewForWidget(render_view_host_);
573 render_view_host_->SetView(view); 573 render_view_host_->SetView(view);
574 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION); 574 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION);
575 575
576 int32 max_page_id = web_contents()-> 576 int32 max_page_id = web_contents()->
577 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); 577 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance());
578 render_view_host_->CreateRenderView(base::string16(), 578 render_view_host_->CreateRenderView(base::string16(),
579 MSG_ROUTING_NONE, 579 MSG_ROUTING_NONE,
580 MSG_ROUTING_NONE,
580 max_page_id, 581 max_page_id,
581 false); 582 false);
582 controller_->delegate()->RenderFrameForInterstitialPageCreated( 583 controller_->delegate()->RenderFrameForInterstitialPageCreated(
583 frame_tree_.root()->current_frame_host()); 584 frame_tree_.root()->current_frame_host());
584 view->SetSize(web_contents()->GetContainerBounds().size()); 585 view->SetSize(web_contents()->GetContainerBounds().size());
585 // Don't show the interstitial until we have navigated to it. 586 // Don't show the interstitial until we have navigated to it.
586 view->Hide(); 587 view->Hide();
587 return wcv; 588 return wcv;
588 } 589 }
589 590
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 899
899 web_contents->GetDelegateView()->TakeFocus(reverse); 900 web_contents->GetDelegateView()->TakeFocus(reverse);
900 } 901 }
901 902
902 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 903 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
903 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 904 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
904 int active_match_ordinal, bool final_update) { 905 int active_match_ordinal, bool final_update) {
905 } 906 }
906 907
907 } // namespace content 908 } // namespace content
OLDNEW
« no previous file with comments | « components/visitedlink/test/visitedlink_unittest.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698