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

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

Issue 373323003: Cache the current WebPreferences on RenderViewHostImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix. Created 6 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/frame_host/interstitial_page_impl.h" 5 #include "content/browser/frame_host/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 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 controller_->delegate()->SetIsLoading( 495 controller_->delegate()->SetIsLoading(
496 controller_->delegate()->GetRenderViewHost(), false, true, NULL); 496 controller_->delegate()->GetRenderViewHost(), false, true, NULL);
497 } 497 }
498 498
499 RendererPreferences InterstitialPageImpl::GetRendererPrefs( 499 RendererPreferences InterstitialPageImpl::GetRendererPrefs(
500 BrowserContext* browser_context) const { 500 BrowserContext* browser_context) const {
501 delegate_->OverrideRendererPrefs(&renderer_preferences_); 501 delegate_->OverrideRendererPrefs(&renderer_preferences_);
502 return renderer_preferences_; 502 return renderer_preferences_;
503 } 503 }
504 504
505 WebPreferences InterstitialPageImpl::GetWebkitPrefs() { 505 WebPreferences InterstitialPageImpl::ComputeWebkitPrefs() {
506 if (!enabled()) 506 if (!enabled())
507 return WebPreferences(); 507 return WebPreferences();
508 508
509 return render_view_host_->GetWebkitPrefs(url_); 509 return render_view_host_->ComputeWebkitPrefs(url_);
510 } 510 }
511 511
512 void InterstitialPageImpl::RenderWidgetDeleted( 512 void InterstitialPageImpl::RenderWidgetDeleted(
513 RenderWidgetHostImpl* render_widget_host) { 513 RenderWidgetHostImpl* render_widget_host) {
514 // TODO(creis): Remove this method once we verify the shutdown path is sane. 514 // TODO(creis): Remove this method once we verify the shutdown path is sane.
515 CHECK(!web_contents_); 515 CHECK(!web_contents_);
516 } 516 }
517 517
518 bool InterstitialPageImpl::PreHandleKeyboardEvent( 518 bool InterstitialPageImpl::PreHandleKeyboardEvent(
519 const NativeWebKeyboardEvent& event, 519 const NativeWebKeyboardEvent& event,
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 899
900 web_contents->GetDelegateView()->TakeFocus(reverse); 900 web_contents->GetDelegateView()->TakeFocus(reverse);
901 } 901 }
902 902
903 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 903 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
904 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 904 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
905 int active_match_ordinal, bool final_update) { 905 int active_match_ordinal, bool final_update) {
906 } 906 }
907 907
908 } // namespace content 908 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698