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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
236 if (new_navigation_) { | 236 if (new_navigation_) { |
237 NavigationEntryImpl* entry = new NavigationEntryImpl; | 237 NavigationEntryImpl* entry = new NavigationEntryImpl; |
238 entry->SetURL(url_); | 238 entry->SetURL(url_); |
239 entry->SetVirtualURL(url_); | 239 entry->SetVirtualURL(url_); |
240 entry->set_page_type(PAGE_TYPE_INTERSTITIAL); | 240 entry->set_page_type(PAGE_TYPE_INTERSTITIAL); |
241 | 241 |
242 // Give delegates a chance to set some states on the navigation entry. | 242 // Give delegates a chance to set some states on the navigation entry. |
243 delegate_->OverrideEntry(entry); | 243 delegate_->OverrideEntry(entry); |
244 | 244 |
245 controller_->SetTransientEntry(entry); | 245 controller_->SetTransientEntry(entry); |
246 | |
247 static_cast<WebContentsImpl*>(web_contents_)->DidChangeVisibleSSLState(); | |
estark
2015/06/25 00:35:47
To avoid unnecessary repainting, we could return a
nasko
2015/06/25 12:59:32
In general, we do care about repaints, as we are t
estark
2015/06/25 14:54:45
Hmm, I think I'll leave it as is. I was thinking t
nasko
2015/06/26 08:53:04
Thanks for digging out the details and for the tho
| |
246 } | 248 } |
247 | 249 |
248 DCHECK(!render_view_host_); | 250 DCHECK(!render_view_host_); |
249 render_view_host_ = CreateRenderViewHost(); | 251 render_view_host_ = CreateRenderViewHost(); |
250 CreateWebContentsView(); | 252 CreateWebContentsView(); |
251 | 253 |
252 std::string data_url = "data:text/html;charset=utf-8," + | 254 std::string data_url = "data:text/html;charset=utf-8," + |
253 net::EscapePath(delegate_->GetHTMLContents()); | 255 net::EscapePath(delegate_->GetHTMLContents()); |
254 frame_tree_.root()->current_frame_host()->NavigateToURL(GURL(data_url)); | 256 frame_tree_.root()->current_frame_host()->NavigateToURL(GURL(data_url)); |
255 | 257 |
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
895 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( | 897 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( |
896 const LoadCommittedDetails& load_details) { | 898 const LoadCommittedDetails& load_details) { |
897 interstitial_->OnNavigatingAwayOrTabClosing(); | 899 interstitial_->OnNavigatingAwayOrTabClosing(); |
898 } | 900 } |
899 | 901 |
900 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { | 902 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { |
901 interstitial_->OnNavigatingAwayOrTabClosing(); | 903 interstitial_->OnNavigatingAwayOrTabClosing(); |
902 } | 904 } |
903 | 905 |
904 } // namespace content | 906 } // namespace content |
OLD | NEW |