| 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/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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 // Just dismiss the interstitial. | 308 // Just dismiss the interstitial. |
| 309 DontProceed(); | 309 DontProceed(); |
| 310 } | 310 } |
| 311 | 311 |
| 312 void InterstitialPage::DidNavigate( | 312 void InterstitialPage::DidNavigate( |
| 313 RenderViewHost* render_view_host, | 313 RenderViewHost* render_view_host, |
| 314 const ViewHostMsg_FrameNavigate_Params& params) { | 314 const ViewHostMsg_FrameNavigate_Params& params) { |
| 315 // A fast user could have navigated away from the page that triggered the | 315 // A fast user could have navigated away from the page that triggered the |
| 316 // interstitial while the interstitial was loading, that would have disabled | 316 // interstitial while the interstitial was loading, that would have disabled |
| 317 // us. In that case we can dismiss ourselves. | 317 // us. In that case we can dismiss ourselves. |
| 318 if (!enabled_){ | 318 if (!enabled_) { |
| 319 DontProceed(); | 319 DontProceed(); |
| 320 return; | 320 return; |
| 321 } | 321 } |
| 322 | 322 |
| 323 // The RenderViewHost has loaded its contents, we can show it now. | 323 // The RenderViewHost has loaded its contents, we can show it now. |
| 324 render_view_host_->view()->Show(); | 324 render_view_host_->view()->Show(); |
| 325 tab_->set_interstitial_page(this); | 325 tab_->set_interstitial_page(this); |
| 326 | 326 |
| 327 RenderWidgetHostView* rwh_view = tab_->render_view_host()->view(); | 327 RenderWidgetHostView* rwh_view = tab_->render_view_host()->view(); |
| 328 | 328 |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 601 } | 601 } |
| 602 | 602 |
| 603 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply( | 603 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply( |
| 604 int request_id, int number_of_matches, const gfx::Rect& selection_rect, | 604 int request_id, int number_of_matches, const gfx::Rect& selection_rect, |
| 605 int active_match_ordinal, bool final_update) { | 605 int active_match_ordinal, bool final_update) { |
| 606 } | 606 } |
| 607 | 607 |
| 608 int InterstitialPage::GetBrowserWindowID() const { | 608 int InterstitialPage::GetBrowserWindowID() const { |
| 609 return tab_->GetBrowserWindowID(); | 609 return tab_->GetBrowserWindowID(); |
| 610 } | 610 } |
| OLD | NEW |