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 <utility> |
7 #include <vector> | 8 #include <vector> |
8 | 9 |
9 #include "base/bind.h" | 10 #include "base/bind.h" |
10 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
11 #include "base/location.h" | 12 #include "base/location.h" |
12 #include "base/macros.h" | 13 #include "base/macros.h" |
13 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
14 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
15 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
16 #include "base/thread_task_runner_handle.h" | 17 #include "base/thread_task_runner_handle.h" |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 if (new_navigation_) { | 235 if (new_navigation_) { |
235 scoped_ptr<NavigationEntryImpl> entry = | 236 scoped_ptr<NavigationEntryImpl> entry = |
236 make_scoped_ptr(new NavigationEntryImpl); | 237 make_scoped_ptr(new NavigationEntryImpl); |
237 entry->SetURL(url_); | 238 entry->SetURL(url_); |
238 entry->SetVirtualURL(url_); | 239 entry->SetVirtualURL(url_); |
239 entry->set_page_type(PAGE_TYPE_INTERSTITIAL); | 240 entry->set_page_type(PAGE_TYPE_INTERSTITIAL); |
240 | 241 |
241 // 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. |
242 delegate_->OverrideEntry(entry.get()); | 243 delegate_->OverrideEntry(entry.get()); |
243 | 244 |
244 controller_->SetTransientEntry(entry.Pass()); | 245 controller_->SetTransientEntry(std::move(entry)); |
245 | 246 |
246 static_cast<WebContentsImpl*>(web_contents_)->DidChangeVisibleSSLState(); | 247 static_cast<WebContentsImpl*>(web_contents_)->DidChangeVisibleSSLState(); |
247 } | 248 } |
248 | 249 |
249 DCHECK(!render_view_host_); | 250 DCHECK(!render_view_host_); |
250 render_view_host_ = CreateRenderViewHost(); | 251 render_view_host_ = CreateRenderViewHost(); |
251 CreateWebContentsView(); | 252 CreateWebContentsView(); |
252 | 253 |
253 GURL data_url = GURL("data:text/html;charset=utf-8," + | 254 GURL data_url = GURL("data:text/html;charset=utf-8," + |
254 net::EscapePath(delegate_->GetHTMLContents())); | 255 net::EscapePath(delegate_->GetHTMLContents())); |
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
940 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( | 941 void InterstitialPageImpl::UnderlyingContentObserver::NavigationEntryCommitted( |
941 const LoadCommittedDetails& load_details) { | 942 const LoadCommittedDetails& load_details) { |
942 interstitial_->OnNavigatingAwayOrTabClosing(); | 943 interstitial_->OnNavigatingAwayOrTabClosing(); |
943 } | 944 } |
944 | 945 |
945 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { | 946 void InterstitialPageImpl::UnderlyingContentObserver::WebContentsDestroyed() { |
946 interstitial_->OnNavigatingAwayOrTabClosing(); | 947 interstitial_->OnNavigatingAwayOrTabClosing(); |
947 } | 948 } |
948 | 949 |
949 } // namespace content | 950 } // namespace content |
OLD | NEW |