| OLD | NEW |
| 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 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 controller_->delegate()->SetIsLoading( | 502 controller_->delegate()->SetIsLoading( |
| 503 controller_->delegate()->GetRenderViewHost(), false, true, NULL); | 503 controller_->delegate()->GetRenderViewHost(), false, true, NULL); |
| 504 } | 504 } |
| 505 | 505 |
| 506 RendererPreferences InterstitialPageImpl::GetRendererPrefs( | 506 RendererPreferences InterstitialPageImpl::GetRendererPrefs( |
| 507 BrowserContext* browser_context) const { | 507 BrowserContext* browser_context) const { |
| 508 delegate_->OverrideRendererPrefs(&renderer_preferences_); | 508 delegate_->OverrideRendererPrefs(&renderer_preferences_); |
| 509 return renderer_preferences_; | 509 return renderer_preferences_; |
| 510 } | 510 } |
| 511 | 511 |
| 512 WebPreferences InterstitialPageImpl::ComputeWebkitPrefs() { | 512 WebPreferences InterstitialPageImpl::GetWebkitPrefs() { |
| 513 if (!enabled()) | 513 if (!enabled()) |
| 514 return WebPreferences(); | 514 return WebPreferences(); |
| 515 | 515 |
| 516 return render_view_host_->ComputeWebkitPrefs(url_); | 516 return render_view_host_->GetWebkitPrefs(url_); |
| 517 } | 517 } |
| 518 | 518 |
| 519 void InterstitialPageImpl::RenderWidgetDeleted( | 519 void InterstitialPageImpl::RenderWidgetDeleted( |
| 520 RenderWidgetHostImpl* render_widget_host) { | 520 RenderWidgetHostImpl* render_widget_host) { |
| 521 // TODO(creis): Remove this method once we verify the shutdown path is sane. | 521 // TODO(creis): Remove this method once we verify the shutdown path is sane. |
| 522 CHECK(!web_contents_); | 522 CHECK(!web_contents_); |
| 523 } | 523 } |
| 524 | 524 |
| 525 bool InterstitialPageImpl::PreHandleKeyboardEvent( | 525 bool InterstitialPageImpl::PreHandleKeyboardEvent( |
| 526 const NativeWebKeyboardEvent& event, | 526 const NativeWebKeyboardEvent& event, |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 910 | 910 |
| 911 web_contents->GetDelegateView()->TakeFocus(reverse); | 911 web_contents->GetDelegateView()->TakeFocus(reverse); |
| 912 } | 912 } |
| 913 | 913 |
| 914 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( | 914 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( |
| 915 int request_id, int number_of_matches, const gfx::Rect& selection_rect, | 915 int request_id, int number_of_matches, const gfx::Rect& selection_rect, |
| 916 int active_match_ordinal, bool final_update) { | 916 int active_match_ordinal, bool final_update) { |
| 917 } | 917 } |
| 918 | 918 |
| 919 } // namespace content | 919 } // namespace content |
| OLD | NEW |