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

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

Issue 212703005: Preserve Page::openedByDOM state across process swaps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 8 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 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 static_cast<WebContentsViewPort*>(web_contents_view); 571 static_cast<WebContentsViewPort*>(web_contents_view);
572 RenderWidgetHostView* view = 572 RenderWidgetHostView* view =
573 web_contents_view_port->CreateViewForWidget(render_view_host_); 573 web_contents_view_port->CreateViewForWidget(render_view_host_);
574 render_view_host_->SetView(view); 574 render_view_host_->SetView(view);
575 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION); 575 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION);
576 576
577 int32 max_page_id = web_contents()-> 577 int32 max_page_id = web_contents()->
578 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); 578 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance());
579 render_view_host_->CreateRenderView(base::string16(), 579 render_view_host_->CreateRenderView(base::string16(),
580 MSG_ROUTING_NONE, 580 MSG_ROUTING_NONE,
581 max_page_id); 581 max_page_id,
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_view->GetContainerSize()); 585 view->SetSize(web_contents_view->GetContainerSize());
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 web_contents_view; 588 return web_contents_view;
588 } 589 }
589 590
590 void InterstitialPageImpl::Proceed() { 591 void InterstitialPageImpl::Proceed() {
591 // Don't repeat this if we are already shutting down. We cannot check for 592 // Don't repeat this if we are already shutting down. We cannot check for
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 898
898 web_contents->GetDelegateView()->TakeFocus(reverse); 899 web_contents->GetDelegateView()->TakeFocus(reverse);
899 } 900 }
900 901
901 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 902 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
902 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 903 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
903 int active_match_ordinal, bool final_update) { 904 int active_match_ordinal, bool final_update) {
904 } 905 }
905 906
906 } // namespace content 907 } // namespace content
OLDNEW
« no previous file with comments | « components/visitedlink/test/visitedlink_unittest.cc ('k') | content/browser/frame_host/render_frame_host_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698