| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/tab_contents/interstitial_page.h" | 5 #include "content/browser/tab_contents/interstitial_page.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 RenderViewHost* render_view_host = new RenderViewHost( | 419 RenderViewHost* render_view_host = new RenderViewHost( |
| 420 SiteInstance::CreateSiteInstance(tab()->profile()), | 420 SiteInstance::CreateSiteInstance(tab()->profile()), |
| 421 this, MSG_ROUTING_NONE, kInvalidSessionStorageNamespaceId); | 421 this, MSG_ROUTING_NONE, kInvalidSessionStorageNamespaceId); |
| 422 return render_view_host; | 422 return render_view_host; |
| 423 } | 423 } |
| 424 | 424 |
| 425 TabContentsView* InterstitialPage::CreateTabContentsView() { | 425 TabContentsView* InterstitialPage::CreateTabContentsView() { |
| 426 TabContentsView* tab_contents_view = tab()->view(); | 426 TabContentsView* tab_contents_view = tab()->view(); |
| 427 RenderWidgetHostView* view = | 427 RenderWidgetHostView* view = |
| 428 tab_contents_view->CreateViewForWidget(render_view_host_); | 428 tab_contents_view->CreateViewForWidget(render_view_host_); |
| 429 render_view_host_->set_view(view); | 429 render_view_host_->SetView(view); |
| 430 render_view_host_->AllowBindings(BindingsPolicy::DOM_AUTOMATION); | 430 render_view_host_->AllowBindings(BindingsPolicy::DOM_AUTOMATION); |
| 431 | 431 |
| 432 render_view_host_->CreateRenderView(string16()); | 432 render_view_host_->CreateRenderView(string16()); |
| 433 view->SetSize(tab_contents_view->GetContainerSize()); | 433 view->SetSize(tab_contents_view->GetContainerSize()); |
| 434 // Don't show the interstitial until we have navigated to it. | 434 // Don't show the interstitial until we have navigated to it. |
| 435 view->Hide(); | 435 view->Hide(); |
| 436 return tab_contents_view; | 436 return tab_contents_view; |
| 437 } | 437 } |
| 438 | 438 |
| 439 void InterstitialPage::Proceed() { | 439 void InterstitialPage::Proceed() { |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 724 | 724 |
| 725 void InterstitialPage::UpdateInspectorSetting(const std::string& key, | 725 void InterstitialPage::UpdateInspectorSetting(const std::string& key, |
| 726 const std::string& value) { | 726 const std::string& value) { |
| 727 RenderViewHostDelegateHelper::UpdateInspectorSetting( | 727 RenderViewHostDelegateHelper::UpdateInspectorSetting( |
| 728 tab_->profile(), key, value); | 728 tab_->profile(), key, value); |
| 729 } | 729 } |
| 730 | 730 |
| 731 void InterstitialPage::ClearInspectorSettings() { | 731 void InterstitialPage::ClearInspectorSettings() { |
| 732 RenderViewHostDelegateHelper::ClearInspectorSettings(tab_->profile()); | 732 RenderViewHostDelegateHelper::ClearInspectorSettings(tab_->profile()); |
| 733 } | 733 } |
| OLD | NEW |