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

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 accessibility test. 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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 static_cast<WebContentsImpl*>(web_contents())->GetView(); 576 static_cast<WebContentsImpl*>(web_contents())->GetView();
577 RenderWidgetHostViewBase* view = 577 RenderWidgetHostViewBase* view =
578 wcv->CreateViewForWidget(render_view_host_); 578 wcv->CreateViewForWidget(render_view_host_);
579 render_view_host_->SetView(view); 579 render_view_host_->SetView(view);
580 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION); 580 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION);
581 581
582 int32 max_page_id = web_contents()-> 582 int32 max_page_id = web_contents()->
583 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); 583 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance());
584 render_view_host_->CreateRenderView(base::string16(), 584 render_view_host_->CreateRenderView(base::string16(),
585 MSG_ROUTING_NONE, 585 MSG_ROUTING_NONE,
586 MSG_ROUTING_NONE,
586 max_page_id, 587 max_page_id,
587 false); 588 false);
588 controller_->delegate()->RenderFrameForInterstitialPageCreated( 589 controller_->delegate()->RenderFrameForInterstitialPageCreated(
589 frame_tree_.root()->current_frame_host()); 590 frame_tree_.root()->current_frame_host());
590 view->SetSize(web_contents()->GetContainerBounds().size()); 591 view->SetSize(web_contents()->GetContainerBounds().size());
591 // Don't show the interstitial until we have navigated to it. 592 // Don't show the interstitial until we have navigated to it.
592 view->Hide(); 593 view->Hide();
593 return wcv; 594 return wcv;
594 } 595 }
595 596
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 905
905 web_contents->GetDelegateView()->TakeFocus(reverse); 906 web_contents->GetDelegateView()->TakeFocus(reverse);
906 } 907 }
907 908
908 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 909 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
909 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 910 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
910 int active_match_ordinal, bool final_update) { 911 int active_match_ordinal, bool final_update) {
911 } 912 }
912 913
913 } // namespace content 914 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698