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 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 frame_tree_.root()->ResetForNewProcess(); | 304 frame_tree_.root()->ResetForNewProcess(); |
305 controller_->delegate()->DetachInterstitialPage(); | 305 controller_->delegate()->DetachInterstitialPage(); |
306 // Let's revert to the original title if necessary. | 306 // Let's revert to the original title if necessary. |
307 NavigationEntry* entry = controller_->GetVisibleEntry(); | 307 NavigationEntry* entry = controller_->GetVisibleEntry(); |
308 if (entry && !new_navigation_ && should_revert_web_contents_title_) { | 308 if (entry && !new_navigation_ && should_revert_web_contents_title_) { |
309 entry->SetTitle(original_web_contents_title_); | 309 entry->SetTitle(original_web_contents_title_); |
310 controller_->delegate()->NotifyNavigationStateChanged( | 310 controller_->delegate()->NotifyNavigationStateChanged( |
311 INVALIDATE_TYPE_TITLE); | 311 INVALIDATE_TYPE_TITLE); |
312 } | 312 } |
313 | 313 |
314 static_cast<WebContentsImpl*>(web_contents_)->DidChangeVisibleSSLState(); | |
315 | |
316 InterstitialPageMap::iterator iter = | 314 InterstitialPageMap::iterator iter = |
317 g_web_contents_to_interstitial_page->find(web_contents_); | 315 g_web_contents_to_interstitial_page->find(web_contents_); |
318 DCHECK(iter != g_web_contents_to_interstitial_page->end()); | 316 DCHECK(iter != g_web_contents_to_interstitial_page->end()); |
319 if (iter != g_web_contents_to_interstitial_page->end()) | 317 if (iter != g_web_contents_to_interstitial_page->end()) |
320 g_web_contents_to_interstitial_page->erase(iter); | 318 g_web_contents_to_interstitial_page->erase(iter); |
321 | 319 |
322 // Clear the WebContents pointer, because it may now be deleted. | 320 // Clear the WebContents pointer, because it may now be deleted. |
323 // This signifies that we are in the process of shutting down. | 321 // This signifies that we are in the process of shutting down. |
324 web_contents_ = NULL; | 322 web_contents_ = NULL; |
325 } | 323 } |
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
945 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( | 943 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( |
946 const LoadCommittedDetails& load_details) { | 944 const LoadCommittedDetails& load_details) { |
947 interstitial_->OnNavigatingAwayOrTabClosing(); | 945 interstitial_->OnNavigatingAwayOrTabClosing(); |
948 } | 946 } |
949 | 947 |
950 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { | 948 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { |
951 interstitial_->OnNavigatingAwayOrTabClosing(); | 949 interstitial_->OnNavigatingAwayOrTabClosing(); |
952 } | 950 } |
953 | 951 |
954 } // namespace content | 952 } // namespace content |
OLD | NEW |