OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/web_contents/interstitial_page_impl.h" | 5 #include "content/browser/web_contents/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" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "base/threading/thread.h" | 14 #include "base/threading/thread.h" |
15 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" | 15 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" |
16 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 16 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
17 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 17 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
18 #include "content/browser/renderer_host/render_process_host_impl.h" | 18 #include "content/browser/renderer_host/render_process_host_impl.h" |
19 #include "content/browser/renderer_host/render_view_host_factory.h" | |
19 #include "content/browser/renderer_host/render_view_host_impl.h" | 20 #include "content/browser/renderer_host/render_view_host_impl.h" |
20 #include "content/browser/site_instance_impl.h" | 21 #include "content/browser/site_instance_impl.h" |
21 #include "content/browser/web_contents/navigation_controller_impl.h" | 22 #include "content/browser/web_contents/navigation_controller_impl.h" |
22 #include "content/browser/web_contents/navigation_entry_impl.h" | 23 #include "content/browser/web_contents/navigation_entry_impl.h" |
23 #include "content/browser/web_contents/web_contents_impl.h" | 24 #include "content/browser/web_contents/web_contents_impl.h" |
24 #include "content/common/view_messages.h" | 25 #include "content/common/view_messages.h" |
25 #include "content/port/browser/render_view_host_delegate_view.h" | 26 #include "content/port/browser/render_view_host_delegate_view.h" |
26 #include "content/port/browser/render_widget_host_view_port.h" | 27 #include "content/port/browser/render_widget_host_view_port.h" |
27 #include "content/port/browser/web_contents_view_port.h" | 28 #include "content/port/browser/web_contents_view_port.h" |
28 #include "content/public/browser/browser_context.h" | 29 #include "content/public/browser/browser_context.h" |
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
490 BrowserContext* browser_context = web_contents()->GetBrowserContext(); | 491 BrowserContext* browser_context = web_contents()->GetBrowserContext(); |
491 scoped_refptr<SiteInstance> site_instance = | 492 scoped_refptr<SiteInstance> site_instance = |
492 SiteInstance::Create(browser_context); | 493 SiteInstance::Create(browser_context); |
493 DOMStorageContextWrapper* dom_storage_context = | 494 DOMStorageContextWrapper* dom_storage_context = |
494 static_cast<DOMStorageContextWrapper*>( | 495 static_cast<DOMStorageContextWrapper*>( |
495 BrowserContext::GetStoragePartition( | 496 BrowserContext::GetStoragePartition( |
496 browser_context, site_instance.get())->GetDOMStorageContext()); | 497 browser_context, site_instance.get())->GetDOMStorageContext()); |
497 session_storage_namespace_ = | 498 session_storage_namespace_ = |
498 new SessionStorageNamespaceImpl(dom_storage_context); | 499 new SessionStorageNamespaceImpl(dom_storage_context); |
499 | 500 |
500 RenderViewHostImpl* render_view_host = | 501 RenderViewHost* render_view_host = |
501 new RenderViewHostImpl(site_instance.get(), | 502 RenderViewHostFactory::Create(site_instance.get(), |
502 this, | 503 this, |
nasko
2013/09/11 22:26:24
nit: align these with site_instance.
awong
2013/09/21 01:19:56
Done.
| |
503 this, | 504 this, |
504 MSG_ROUTING_NONE, | 505 MSG_ROUTING_NONE, |
505 MSG_ROUTING_NONE, | 506 MSG_ROUTING_NONE, |
506 false, | 507 false, |
507 false); | 508 false); |
508 web_contents_->RenderViewForInterstitialPageCreated(render_view_host); | 509 web_contents_->RenderViewForInterstitialPageCreated(render_view_host); |
509 return render_view_host; | 510 return render_view_host; |
510 } | 511 } |
511 | 512 |
512 WebContentsView* InterstitialPageImpl::CreateWebContentsView() { | 513 WebContentsView* InterstitialPageImpl::CreateWebContentsView() { |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
812 | 813 |
813 web_contents->GetDelegateView()->TakeFocus(reverse); | 814 web_contents->GetDelegateView()->TakeFocus(reverse); |
814 } | 815 } |
815 | 816 |
816 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( | 817 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( |
817 int request_id, int number_of_matches, const gfx::Rect& selection_rect, | 818 int request_id, int number_of_matches, const gfx::Rect& selection_rect, |
818 int active_match_ordinal, bool final_update) { | 819 int active_match_ordinal, bool final_update) { |
819 } | 820 } |
820 | 821 |
821 } // namespace content | 822 } // namespace content |
OLD | NEW |