Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: content/browser/web_contents/interstitial_page_impl.cc

Issue 10378089: Browser Plugin: Removed BrowserPluginWebContentsObserver (to be replaced by rewritten BrowserPlugi… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Yet another unit test fixed Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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,
511 -1);
510 view->SetSize(web_contents_view->GetContainerSize()); 512 view->SetSize(web_contents_view->GetContainerSize());
511 // Don't show the interstitial until we have navigated to it. 513 // Don't show the interstitial until we have navigated to it.
512 view->Hide(); 514 view->Hide();
513 return web_contents_view; 515 return web_contents_view;
514 } 516 }
515 517
516 void InterstitialPageImpl::Proceed() { 518 void InterstitialPageImpl::Proceed() {
517 if (action_taken_ != NO_ACTION) { 519 if (action_taken_ != NO_ACTION) {
518 NOTREACHED(); 520 NOTREACHED();
519 return; 521 return;
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 if (!web_contents->GetViewDelegate()) 748 if (!web_contents->GetViewDelegate())
747 return; 749 return;
748 750
749 web_contents->GetViewDelegate()->TakeFocus(reverse); 751 web_contents->GetViewDelegate()->TakeFocus(reverse);
750 } 752 }
751 753
752 void InterstitialPageImpl::InterstitialPageRVHViewDelegate::OnFindReply( 754 void InterstitialPageImpl::InterstitialPageRVHViewDelegate::OnFindReply(
753 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 755 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
754 int active_match_ordinal, bool final_update) { 756 int active_match_ordinal, bool final_update) {
755 } 757 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/test_render_view_host.cc ('k') | content/browser/web_contents/test_web_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698