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" |
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 RenderWidgetHostView* view = | 502 RenderWidgetHostView* view = |
503 web_contents_view->CreateViewForWidget(render_view_host_); | 503 web_contents_view->CreateViewForWidget(render_view_host_); |
504 render_view_host_->SetView(view); | 504 render_view_host_->SetView(view); |
505 render_view_host_->AllowBindings(content::BINDINGS_POLICY_DOM_AUTOMATION); | 505 render_view_host_->AllowBindings(content::BINDINGS_POLICY_DOM_AUTOMATION); |
506 | 506 |
507 int32 max_page_id = web_contents()-> | 507 int32 max_page_id = web_contents()-> |
508 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); | 508 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); |
509 render_view_host_->CreateRenderView(string16(), | 509 render_view_host_->CreateRenderView(string16(), |
510 MSG_ROUTING_NONE, | 510 MSG_ROUTING_NONE, |
511 max_page_id, | 511 max_page_id, |
| 512 -1, |
512 -1); | 513 -1); |
513 view->SetSize(web_contents_view->GetContainerSize()); | 514 view->SetSize(web_contents_view->GetContainerSize()); |
514 // Don't show the interstitial until we have navigated to it. | 515 // Don't show the interstitial until we have navigated to it. |
515 view->Hide(); | 516 view->Hide(); |
516 return web_contents_view; | 517 return web_contents_view; |
517 } | 518 } |
518 | 519 |
519 void InterstitialPageImpl::Proceed() { | 520 void InterstitialPageImpl::Proceed() { |
520 if (action_taken_ != NO_ACTION) { | 521 if (action_taken_ != NO_ACTION) { |
521 NOTREACHED(); | 522 NOTREACHED(); |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
745 if (!web_contents->GetViewDelegate()) | 746 if (!web_contents->GetViewDelegate()) |
746 return; | 747 return; |
747 | 748 |
748 web_contents->GetViewDelegate()->TakeFocus(reverse); | 749 web_contents->GetViewDelegate()->TakeFocus(reverse); |
749 } | 750 } |
750 | 751 |
751 void InterstitialPageImpl::InterstitialPageRVHViewDelegate::OnFindReply( | 752 void InterstitialPageImpl::InterstitialPageRVHViewDelegate::OnFindReply( |
752 int request_id, int number_of_matches, const gfx::Rect& selection_rect, | 753 int request_id, int number_of_matches, const gfx::Rect& selection_rect, |
753 int active_match_ordinal, bool final_update) { | 754 int active_match_ordinal, bool final_update) { |
754 } | 755 } |
OLD | NEW |