| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/tab_contents/interstitial_page.h" | 5 #include "chrome/browser/tab_contents/interstitial_page.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/thread.h" | 10 #include "base/thread.h" |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 } | 326 } |
| 327 | 327 |
| 328 RenderViewHostDelegate::View* InterstitialPage::GetViewDelegate() { | 328 RenderViewHostDelegate::View* InterstitialPage::GetViewDelegate() { |
| 329 return rvh_view_delegate_.get(); | 329 return rvh_view_delegate_.get(); |
| 330 } | 330 } |
| 331 | 331 |
| 332 const GURL& InterstitialPage::GetURL() const { | 332 const GURL& InterstitialPage::GetURL() const { |
| 333 return url_; | 333 return url_; |
| 334 } | 334 } |
| 335 | 335 |
| 336 void InterstitialPage::RenderViewGone(RenderViewHost* render_view_host) { | 336 void InterstitialPage::RenderViewGone(RenderViewHost* render_view_host, |
| 337 base::TerminationStatus status, |
| 338 int error_code) { |
| 337 // Our renderer died. This should not happen in normal cases. | 339 // Our renderer died. This should not happen in normal cases. |
| 338 // Just dismiss the interstitial. | 340 // Just dismiss the interstitial. |
| 339 DontProceed(); | 341 DontProceed(); |
| 340 } | 342 } |
| 341 | 343 |
| 342 void InterstitialPage::DidNavigate( | 344 void InterstitialPage::DidNavigate( |
| 343 RenderViewHost* render_view_host, | 345 RenderViewHost* render_view_host, |
| 344 const ViewHostMsg_FrameNavigate_Params& params) { | 346 const ViewHostMsg_FrameNavigate_Params& params) { |
| 345 // A fast user could have navigated away from the page that triggered the | 347 // A fast user could have navigated away from the page that triggered the |
| 346 // interstitial while the interstitial was loading, that would have disabled | 348 // interstitial while the interstitial was loading, that would have disabled |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 715 | 717 |
| 716 void InterstitialPage::UpdateInspectorSetting(const std::string& key, | 718 void InterstitialPage::UpdateInspectorSetting(const std::string& key, |
| 717 const std::string& value) { | 719 const std::string& value) { |
| 718 RenderViewHostDelegateHelper::UpdateInspectorSetting( | 720 RenderViewHostDelegateHelper::UpdateInspectorSetting( |
| 719 tab_->profile(), key, value); | 721 tab_->profile(), key, value); |
| 720 } | 722 } |
| 721 | 723 |
| 722 void InterstitialPage::ClearInspectorSettings() { | 724 void InterstitialPage::ClearInspectorSettings() { |
| 723 RenderViewHostDelegateHelper::ClearInspectorSettings(tab_->profile()); | 725 RenderViewHostDelegateHelper::ClearInspectorSettings(tab_->profile()); |
| 724 } | 726 } |
| OLD | NEW |