| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "base/thread.h" | 8 #include "base/thread.h" |
| 9 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
| 10 #include "chrome/browser/browser_list.h" | 10 #include "chrome/browser/browser_list.h" |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 DontProceed(); | 356 DontProceed(); |
| 357 return; | 357 return; |
| 358 } | 358 } |
| 359 | 359 |
| 360 // The RenderViewHost has loaded its contents, we can show it now. | 360 // The RenderViewHost has loaded its contents, we can show it now. |
| 361 render_view_host_->view()->Show(); | 361 render_view_host_->view()->Show(); |
| 362 tab_->set_interstitial_page(this); | 362 tab_->set_interstitial_page(this); |
| 363 | 363 |
| 364 // Notify the tab we are not loading so the throbber is stopped. It also | 364 // Notify the tab we are not loading so the throbber is stopped. It also |
| 365 // causes a NOTIFY_LOAD_STOP notification, that the AutomationProvider (used | 365 // causes a NOTIFY_LOAD_STOP notification, that the AutomationProvider (used |
| 366 // by the UI tests) expects to consider a navigation as complete. Without this
, | 366 // by the UI tests) expects to consider a navigation as complete. Without |
| 367 // navigating in a UI test to a URL that triggers an interstitial would hang. | 367 // this, navigating in a UI test to a URL that triggers an interstitial would |
| 368 // hang. |
| 368 tab_->SetIsLoading(false, NULL); | 369 tab_->SetIsLoading(false, NULL); |
| 369 #else | 370 #else |
| 370 // TODO(port): we need RenderViewHost. | 371 // TODO(port): we need RenderViewHost. |
| 371 NOTIMPLEMENTED(); | 372 NOTIMPLEMENTED(); |
| 372 #endif | 373 #endif |
| 373 } | 374 } |
| 374 | 375 |
| 375 void InterstitialPage::RenderViewGone(RenderViewHost* render_view_host) { | 376 void InterstitialPage::RenderViewGone(RenderViewHost* render_view_host) { |
| 376 // Our renderer died. This should not happen in normal cases. | 377 // Our renderer died. This should not happen in normal cases. |
| 377 // Just dismiss the interstitial. | 378 // Just dismiss the interstitial. |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 void InterstitialPage::InterstitialPageRVHViewDelegate:: | 507 void InterstitialPage::InterstitialPageRVHViewDelegate:: |
| 507 ForwardMessageToDevToolsClient(const IPC::Message& message) { | 508 ForwardMessageToDevToolsClient(const IPC::Message& message) { |
| 508 NOTREACHED() << "InterstitialPage does not support developer tools content."; | 509 NOTREACHED() << "InterstitialPage does not support developer tools content."; |
| 509 } | 510 } |
| 510 | 511 |
| 511 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply( | 512 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply( |
| 512 int request_id, int number_of_matches, const gfx::Rect& selection_rect, | 513 int request_id, int number_of_matches, const gfx::Rect& selection_rect, |
| 513 int active_match_ordinal, bool final_update) { | 514 int active_match_ordinal, bool final_update) { |
| 514 } | 515 } |
| 515 | 516 |
| OLD | NEW |