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

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

Issue 10450002: Transfer user agent override info between browser and renderer (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Diff shows what we do downstream 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
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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 RenderWidgetHostView* view = 496 RenderWidgetHostView* view =
497 web_contents_view->CreateViewForWidget(render_view_host_); 497 web_contents_view->CreateViewForWidget(render_view_host_);
498 render_view_host_->SetView(view); 498 render_view_host_->SetView(view);
499 render_view_host_->AllowBindings(content::BINDINGS_POLICY_DOM_AUTOMATION); 499 render_view_host_->AllowBindings(content::BINDINGS_POLICY_DOM_AUTOMATION);
500 500
501 int32 max_page_id = web_contents()-> 501 int32 max_page_id = web_contents()->
502 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); 502 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance());
503 render_view_host_->CreateRenderView(string16(), 503 render_view_host_->CreateRenderView(string16(),
504 MSG_ROUTING_NONE, 504 MSG_ROUTING_NONE,
505 max_page_id, 505 max_page_id,
506 -1); 506 -1,
507 web_contents()->GetUserAgentOverride());
Charlie Reis 2012/06/01 00:36:08 Is it meaningful for an interstitial page's user a
gone 2012/06/01 01:04:06 It not exactly setting the interstitial's user age
Charlie Reis 2012/06/01 18:04:09 Ah. An interstitial's RenderView will never be us
gone 2012/06/14 00:46:39 Will pass in an empty string.
507 view->SetSize(web_contents_view->GetContainerSize()); 508 view->SetSize(web_contents_view->GetContainerSize());
508 // Don't show the interstitial until we have navigated to it. 509 // Don't show the interstitial until we have navigated to it.
509 view->Hide(); 510 view->Hide();
510 return web_contents_view; 511 return web_contents_view;
511 } 512 }
512 513
513 void InterstitialPageImpl::Proceed() { 514 void InterstitialPageImpl::Proceed() {
514 if (action_taken_ != NO_ACTION) { 515 if (action_taken_ != NO_ACTION) {
515 NOTREACHED(); 516 NOTREACHED();
516 return; 517 return;
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 if (!web_contents->GetViewDelegate()) 731 if (!web_contents->GetViewDelegate())
731 return; 732 return;
732 733
733 web_contents->GetViewDelegate()->TakeFocus(reverse); 734 web_contents->GetViewDelegate()->TakeFocus(reverse);
734 } 735 }
735 736
736 void InterstitialPageImpl::InterstitialPageRVHViewDelegate::OnFindReply( 737 void InterstitialPageImpl::InterstitialPageRVHViewDelegate::OnFindReply(
737 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 738 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
738 int active_match_ordinal, bool final_update) { 739 int active_match_ordinal, bool final_update) {
739 } 740 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698