Chromium Code Reviews| 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 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 498 if (!create_view_) | 498 if (!create_view_) |
| 499 return NULL; | 499 return NULL; |
| 500 WebContentsView* web_contents_view = web_contents()->GetView(); | 500 WebContentsView* web_contents_view = web_contents()->GetView(); |
| 501 RenderWidgetHostView* view = | 501 RenderWidgetHostView* view = |
| 502 web_contents_view->CreateViewForWidget(render_view_host_); | 502 web_contents_view->CreateViewForWidget(render_view_host_); |
| 503 render_view_host_->SetView(view); | 503 render_view_host_->SetView(view); |
| 504 render_view_host_->AllowBindings(content::BINDINGS_POLICY_DOM_AUTOMATION); | 504 render_view_host_->AllowBindings(content::BINDINGS_POLICY_DOM_AUTOMATION); |
| 505 | 505 |
| 506 int32 max_page_id = web_contents()-> | 506 int32 max_page_id = web_contents()-> |
| 507 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); | 507 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); |
| 508 render_view_host_->CreateRenderView(string16(), MSG_ROUTING_NONE, | 508 render_view_host_->CreateRenderView(string16(), |
| 509 max_page_id); | 509 MSG_ROUTING_NONE, |
| 510 max_page_id, 0, 0); | |
|
Charlie Reis
2012/05/11 17:41:03
It might be more consistent with other ID schemes
Fady Samuel
2012/05/11 22:03:34
Done.
| |
| 510 view->SetSize(web_contents_view->GetContainerSize()); | 511 view->SetSize(web_contents_view->GetContainerSize()); |
| 511 // Don't show the interstitial until we have navigated to it. | 512 // Don't show the interstitial until we have navigated to it. |
| 512 view->Hide(); | 513 view->Hide(); |
| 513 return web_contents_view; | 514 return web_contents_view; |
| 514 } | 515 } |
| 515 | 516 |
| 516 void InterstitialPageImpl::Proceed() { | 517 void InterstitialPageImpl::Proceed() { |
| 517 if (action_taken_ != NO_ACTION) { | 518 if (action_taken_ != NO_ACTION) { |
| 518 NOTREACHED(); | 519 NOTREACHED(); |
| 519 return; | 520 return; |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 746 if (!web_contents->GetViewDelegate()) | 747 if (!web_contents->GetViewDelegate()) |
| 747 return; | 748 return; |
| 748 | 749 |
| 749 web_contents->GetViewDelegate()->TakeFocus(reverse); | 750 web_contents->GetViewDelegate()->TakeFocus(reverse); |
| 750 } | 751 } |
| 751 | 752 |
| 752 void InterstitialPageImpl::InterstitialPageRVHViewDelegate::OnFindReply( | 753 void InterstitialPageImpl::InterstitialPageRVHViewDelegate::OnFindReply( |
| 753 int request_id, int number_of_matches, const gfx::Rect& selection_rect, | 754 int request_id, int number_of_matches, const gfx::Rect& selection_rect, |
| 754 int active_match_ordinal, bool final_update) { | 755 int active_match_ordinal, bool final_update) { |
| 755 } | 756 } |
| OLD | NEW |