| 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/thread.h" | 9 #include "base/thread.h" |
| 10 #include "chrome/browser/browser_list.h" | 10 #include "chrome/browser/browser_list.h" |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 | 180 |
| 181 // Update the tab_to_interstitial_page_ map. | 181 // Update the tab_to_interstitial_page_ map. |
| 182 InterstitialPageMap::const_iterator iter = | 182 InterstitialPageMap::const_iterator iter = |
| 183 tab_to_interstitial_page_->find(tab_); | 183 tab_to_interstitial_page_->find(tab_); |
| 184 DCHECK(iter == tab_to_interstitial_page_->end()); | 184 DCHECK(iter == tab_to_interstitial_page_->end()); |
| 185 (*tab_to_interstitial_page_)[tab_] = this; | 185 (*tab_to_interstitial_page_)[tab_] = this; |
| 186 | 186 |
| 187 if (new_navigation_) { | 187 if (new_navigation_) { |
| 188 NavigationEntry* entry = new NavigationEntry; | 188 NavigationEntry* entry = new NavigationEntry; |
| 189 entry->set_url(url_); | 189 entry->set_url(url_); |
| 190 entry->set_display_url(url_); | 190 entry->set_virtual_url(url_); |
| 191 entry->set_page_type(NavigationEntry::INTERSTITIAL_PAGE); | 191 entry->set_page_type(NavigationEntry::INTERSTITIAL_PAGE); |
| 192 | 192 |
| 193 // Give sub-classes a chance to set some states on the navigation entry. | 193 // Give sub-classes a chance to set some states on the navigation entry. |
| 194 UpdateEntry(entry); | 194 UpdateEntry(entry); |
| 195 | 195 |
| 196 tab_->controller().AddTransientEntry(entry); | 196 tab_->controller().AddTransientEntry(entry); |
| 197 } | 197 } |
| 198 | 198 |
| 199 DCHECK(!render_view_host_); | 199 DCHECK(!render_view_host_); |
| 200 render_view_host_ = CreateRenderViewHost(); | 200 render_view_host_ = CreateRenderViewHost(); |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 | 584 |
| 585 void InterstitialPage::InterstitialPageRVHViewDelegate::HandleMouseLeave() { | 585 void InterstitialPage::InterstitialPageRVHViewDelegate::HandleMouseLeave() { |
| 586 if (interstitial_page_->tab() && interstitial_page_->tab()->GetViewDelegate()) | 586 if (interstitial_page_->tab() && interstitial_page_->tab()->GetViewDelegate()) |
| 587 interstitial_page_->tab()->GetViewDelegate()->HandleMouseLeave(); | 587 interstitial_page_->tab()->GetViewDelegate()->HandleMouseLeave(); |
| 588 } | 588 } |
| 589 | 589 |
| 590 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply( | 590 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply( |
| 591 int request_id, int number_of_matches, const gfx::Rect& selection_rect, | 591 int request_id, int number_of_matches, const gfx::Rect& selection_rect, |
| 592 int active_match_ordinal, bool final_update) { | 592 int active_match_ordinal, bool final_update) { |
| 593 } | 593 } |
| OLD | NEW |