Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 1314843007: Refactor connection_security into SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: create SecurityStateModel for chromeos login webview Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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
314 InterstitialPageMap::iterator iter = 316 InterstitialPageMap::iterator iter =
315 g_web_contents_to_interstitial_page->find(web_contents_); 317 g_web_contents_to_interstitial_page->find(web_contents_);
316 DCHECK(iter != g_web_contents_to_interstitial_page->end()); 318 DCHECK(iter != g_web_contents_to_interstitial_page->end());
317 if (iter != g_web_contents_to_interstitial_page->end()) 319 if (iter != g_web_contents_to_interstitial_page->end())
318 g_web_contents_to_interstitial_page->erase(iter); 320 g_web_contents_to_interstitial_page->erase(iter);
319 321
320 // Clear the WebContents pointer, because it may now be deleted. 322 // Clear the WebContents pointer, because it may now be deleted.
321 // This signifies that we are in the process of shutting down. 323 // This signifies that we are in the process of shutting down.
322 web_contents_ = NULL; 324 web_contents_ = NULL;
323 } 325 }
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( 945 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted(
944 const LoadCommittedDetails& load_details) { 946 const LoadCommittedDetails& load_details) {
945 interstitial_->OnNavigatingAwayOrTabClosing(); 947 interstitial_->OnNavigatingAwayOrTabClosing();
946 } 948 }
947 949
948 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { 950 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() {
949 interstitial_->OnNavigatingAwayOrTabClosing(); 951 interstitial_->OnNavigatingAwayOrTabClosing();
950 } 952 }
951 953
952 } // namespace content 954 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698