| OLD | NEW |
| 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 <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 wcv->CreateViewForWidget(render_view_host_->GetWidget(), false); | 591 wcv->CreateViewForWidget(render_view_host_->GetWidget(), false); |
| 592 RenderWidgetHostImpl::From(render_view_host_->GetWidget())->SetView(view); | 592 RenderWidgetHostImpl::From(render_view_host_->GetWidget())->SetView(view); |
| 593 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION); | 593 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION); |
| 594 | 594 |
| 595 int32_t max_page_id = web_contents()->GetMaxPageIDForSiteInstance( | 595 int32_t max_page_id = web_contents()->GetMaxPageIDForSiteInstance( |
| 596 render_view_host_->GetSiteInstance()); | 596 render_view_host_->GetSiteInstance()); |
| 597 render_view_host_->CreateRenderView(MSG_ROUTING_NONE, | 597 render_view_host_->CreateRenderView(MSG_ROUTING_NONE, |
| 598 MSG_ROUTING_NONE, | 598 MSG_ROUTING_NONE, |
| 599 max_page_id, | 599 max_page_id, |
| 600 FrameReplicationState(), | 600 FrameReplicationState(), |
| 601 false); | 601 false, 0.0); |
| 602 controller_->delegate()->RenderFrameForInterstitialPageCreated( | 602 controller_->delegate()->RenderFrameForInterstitialPageCreated( |
| 603 frame_tree_.root()->current_frame_host()); | 603 frame_tree_.root()->current_frame_host()); |
| 604 view->SetSize(web_contents()->GetContainerBounds().size()); | 604 view->SetSize(web_contents()->GetContainerBounds().size()); |
| 605 // Don't show the interstitial until we have navigated to it. | 605 // Don't show the interstitial until we have navigated to it. |
| 606 view->Hide(); | 606 view->Hide(); |
| 607 return wcv; | 607 return wcv; |
| 608 } | 608 } |
| 609 | 609 |
| 610 void InterstitialPageImpl::Proceed() { | 610 void InterstitialPageImpl::Proceed() { |
| 611 // Don't repeat this if we are already shutting down. We cannot check for | 611 // Don't repeat this if we are already shutting down. We cannot check for |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 924 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( | 924 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( |
| 925 const LoadCommittedDetails& load_details) { | 925 const LoadCommittedDetails& load_details) { |
| 926 interstitial_->OnNavigatingAwayOrTabClosing(); | 926 interstitial_->OnNavigatingAwayOrTabClosing(); |
| 927 } | 927 } |
| 928 | 928 |
| 929 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { | 929 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { |
| 930 interstitial_->OnNavigatingAwayOrTabClosing(); | 930 interstitial_->OnNavigatingAwayOrTabClosing(); |
| 931 } | 931 } |
| 932 | 932 |
| 933 } // namespace content | 933 } // namespace content |
| OLD | NEW |