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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 scoped_ptr<NavigationEntryImpl> entry = | 237 scoped_ptr<NavigationEntryImpl> entry = |
238 make_scoped_ptr(new NavigationEntryImpl); | 238 make_scoped_ptr(new NavigationEntryImpl); |
239 entry->SetURL(url_); | 239 entry->SetURL(url_); |
240 entry->SetVirtualURL(url_); | 240 entry->SetVirtualURL(url_); |
241 entry->set_page_type(PAGE_TYPE_INTERSTITIAL); | 241 entry->set_page_type(PAGE_TYPE_INTERSTITIAL); |
242 | 242 |
243 // Give delegates a chance to set some states on the navigation entry. | 243 // Give delegates a chance to set some states on the navigation entry. |
244 delegate_->OverrideEntry(entry.get()); | 244 delegate_->OverrideEntry(entry.get()); |
245 | 245 |
246 controller_->SetTransientEntry(entry.Pass()); | 246 controller_->SetTransientEntry(entry.Pass()); |
| 247 |
| 248 static_cast<WebContentsImpl*>(web_contents_)->DidChangeVisibleSSLState(); |
247 } | 249 } |
248 | 250 |
249 DCHECK(!render_view_host_); | 251 DCHECK(!render_view_host_); |
250 render_view_host_ = CreateRenderViewHost(); | 252 render_view_host_ = CreateRenderViewHost(); |
251 CreateWebContentsView(); | 253 CreateWebContentsView(); |
252 | 254 |
253 std::string data_url = "data:text/html;charset=utf-8," + | 255 std::string data_url = "data:text/html;charset=utf-8," + |
254 net::EscapePath(delegate_->GetHTMLContents()); | 256 net::EscapePath(delegate_->GetHTMLContents()); |
255 frame_tree_.root()->current_frame_host()->NavigateToURL(GURL(data_url)); | 257 frame_tree_.root()->current_frame_host()->NavigateToURL(GURL(data_url)); |
256 frame_tree_.root()->current_frame_host()->SetAccessibilityMode( | 258 frame_tree_.root()->current_frame_host()->SetAccessibilityMode( |
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
897 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( | 899 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( |
898 const LoadCommittedDetails& load_details) { | 900 const LoadCommittedDetails& load_details) { |
899 interstitial_->OnNavigatingAwayOrTabClosing(); | 901 interstitial_->OnNavigatingAwayOrTabClosing(); |
900 } | 902 } |
901 | 903 |
902 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { | 904 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { |
903 interstitial_->OnNavigatingAwayOrTabClosing(); | 905 interstitial_->OnNavigatingAwayOrTabClosing(); |
904 } | 906 } |
905 | 907 |
906 } // namespace content | 908 } // namespace content |
OLD | NEW |