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 <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 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
587 DOMStorageContextWrapper* dom_storage_context = | 587 DOMStorageContextWrapper* dom_storage_context = |
588 static_cast<DOMStorageContextWrapper*>( | 588 static_cast<DOMStorageContextWrapper*>( |
589 BrowserContext::GetStoragePartition( | 589 BrowserContext::GetStoragePartition( |
590 browser_context, site_instance.get())->GetDOMStorageContext()); | 590 browser_context, site_instance.get())->GetDOMStorageContext()); |
591 session_storage_namespace_ = | 591 session_storage_namespace_ = |
592 new SessionStorageNamespaceImpl(dom_storage_context); | 592 new SessionStorageNamespaceImpl(dom_storage_context); |
593 | 593 |
594 // Use the RenderViewHost from our FrameTree. | 594 // Use the RenderViewHost from our FrameTree. |
595 frame_tree_.root()->render_manager()->Init( | 595 frame_tree_.root()->render_manager()->Init( |
596 browser_context, site_instance.get(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, | 596 browser_context, site_instance.get(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, |
597 MSG_ROUTING_NONE, 0 /* surface_id */); | 597 MSG_ROUTING_NONE); |
598 return frame_tree_.root()->current_frame_host()->render_view_host(); | 598 return frame_tree_.root()->current_frame_host()->render_view_host(); |
599 } | 599 } |
600 | 600 |
601 WebContentsView* InterstitialPageImpl::CreateWebContentsView() { | 601 WebContentsView* InterstitialPageImpl::CreateWebContentsView() { |
602 if (!enabled() || !create_view_) | 602 if (!enabled() || !create_view_) |
603 return NULL; | 603 return NULL; |
604 WebContentsView* wcv = | 604 WebContentsView* wcv = |
605 static_cast<WebContentsImpl*>(web_contents())->GetView(); | 605 static_cast<WebContentsImpl*>(web_contents())->GetView(); |
606 RenderWidgetHostViewBase* view = | 606 RenderWidgetHostViewBase* view = |
607 wcv->CreateViewForWidget(render_view_host_, false); | 607 wcv->CreateViewForWidget(render_view_host_, false); |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
760 SiteInstance* source_site_instance, | 760 SiteInstance* source_site_instance, |
761 int route_id, | 761 int route_id, |
762 int main_frame_route_id, | 762 int main_frame_route_id, |
763 const ViewHostMsg_CreateWindow_Params& params, | 763 const ViewHostMsg_CreateWindow_Params& params, |
764 SessionStorageNamespace* session_storage_namespace) { | 764 SessionStorageNamespace* session_storage_namespace) { |
765 NOTREACHED() << "InterstitialPage does not support showing popups yet."; | 765 NOTREACHED() << "InterstitialPage does not support showing popups yet."; |
766 } | 766 } |
767 | 767 |
768 void InterstitialPageImpl::CreateNewWidget(int32 render_process_id, | 768 void InterstitialPageImpl::CreateNewWidget(int32 render_process_id, |
769 int32 route_id, | 769 int32 route_id, |
770 int32 surface_id, | |
771 blink::WebPopupType popup_type) { | 770 blink::WebPopupType popup_type) { |
772 NOTREACHED() << "InterstitialPage does not support showing drop-downs yet."; | 771 NOTREACHED() << "InterstitialPage does not support showing drop-downs yet."; |
773 } | 772 } |
774 | 773 |
775 void InterstitialPageImpl::CreateNewFullscreenWidget(int32 render_process_id, | 774 void InterstitialPageImpl::CreateNewFullscreenWidget(int32 render_process_id, |
776 int32 route_id, | 775 int32 route_id) { |
777 int32 surface_id) { | |
778 NOTREACHED() | 776 NOTREACHED() |
779 << "InterstitialPage does not support showing full screen popups."; | 777 << "InterstitialPage does not support showing full screen popups."; |
780 } | 778 } |
781 | 779 |
782 void InterstitialPageImpl::ShowCreatedWindow(int route_id, | 780 void InterstitialPageImpl::ShowCreatedWindow(int route_id, |
783 WindowOpenDisposition disposition, | 781 WindowOpenDisposition disposition, |
784 const gfx::Rect& initial_rect, | 782 const gfx::Rect& initial_rect, |
785 bool user_gesture) { | 783 bool user_gesture) { |
786 NOTREACHED() << "InterstitialPage does not support showing popups yet."; | 784 NOTREACHED() << "InterstitialPage does not support showing popups yet."; |
787 } | 785 } |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
942 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( | 940 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( |
943 const LoadCommittedDetails& load_details) { | 941 const LoadCommittedDetails& load_details) { |
944 interstitial_->OnNavigatingAwayOrTabClosing(); | 942 interstitial_->OnNavigatingAwayOrTabClosing(); |
945 } | 943 } |
946 | 944 |
947 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { | 945 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { |
948 interstitial_->OnNavigatingAwayOrTabClosing(); | 946 interstitial_->OnNavigatingAwayOrTabClosing(); |
949 } | 947 } |
950 | 948 |
951 } // namespace content | 949 } // namespace content |
OLD | NEW |