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

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

Issue 1142123002: Remove swapped-out usage in --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another round of fixes. Created 5 years, 6 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
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 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 wcv->CreateViewForWidget(render_view_host_, false); 558 wcv->CreateViewForWidget(render_view_host_, false);
559 render_view_host_->SetView(view); 559 render_view_host_->SetView(view);
560 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION); 560 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION);
561 561
562 int32 max_page_id = web_contents()-> 562 int32 max_page_id = web_contents()->
563 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); 563 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance());
564 render_view_host_->CreateRenderView(base::string16(), 564 render_view_host_->CreateRenderView(base::string16(),
565 MSG_ROUTING_NONE, 565 MSG_ROUTING_NONE,
566 MSG_ROUTING_NONE, 566 MSG_ROUTING_NONE,
567 max_page_id, 567 max_page_id,
568 FrameReplicationState(),
568 false); 569 false);
569 controller_->delegate()->RenderFrameForInterstitialPageCreated( 570 controller_->delegate()->RenderFrameForInterstitialPageCreated(
570 frame_tree_.root()->current_frame_host()); 571 frame_tree_.root()->current_frame_host());
571 view->SetSize(web_contents()->GetContainerBounds().size()); 572 view->SetSize(web_contents()->GetContainerBounds().size());
572 // Don't show the interstitial until we have navigated to it. 573 // Don't show the interstitial until we have navigated to it.
573 view->Hide(); 574 view->Hide();
574 return wcv; 575 return wcv;
575 } 576 }
576 577
577 void InterstitialPageImpl::Proceed() { 578 void InterstitialPageImpl::Proceed() {
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( 894 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted(
894 const LoadCommittedDetails& load_details) { 895 const LoadCommittedDetails& load_details) {
895 interstitial_->OnNavigatingAwayOrTabClosing(); 896 interstitial_->OnNavigatingAwayOrTabClosing();
896 } 897 }
897 898
898 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { 899 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() {
899 interstitial_->OnNavigatingAwayOrTabClosing(); 900 interstitial_->OnNavigatingAwayOrTabClosing();
900 } 901 }
901 902
902 } // namespace content 903 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698