| 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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 controller_->SetTransientEntry(entry); | 243 controller_->SetTransientEntry(entry); |
| 244 } | 244 } |
| 245 | 245 |
| 246 DCHECK(!render_view_host_); | 246 DCHECK(!render_view_host_); |
| 247 render_view_host_ = static_cast<RenderViewHostImpl*>(CreateRenderViewHost()); | 247 render_view_host_ = static_cast<RenderViewHostImpl*>(CreateRenderViewHost()); |
| 248 render_view_host_->AttachToFrameTree(); | 248 render_view_host_->AttachToFrameTree(); |
| 249 CreateWebContentsView(); | 249 CreateWebContentsView(); |
| 250 | 250 |
| 251 std::string data_url = "data:text/html;charset=utf-8," + | 251 std::string data_url = "data:text/html;charset=utf-8," + |
| 252 net::EscapePath(delegate_->GetHTMLContents()); | 252 net::EscapePath(delegate_->GetHTMLContents()); |
| 253 render_view_host_->NavigateToURL(GURL(data_url)); | 253 frame_tree_.root()->current_frame_host()->NavigateToURL(GURL(data_url)); |
| 254 | 254 |
| 255 notification_registrar_.Add(this, NOTIFICATION_NAV_ENTRY_PENDING, | 255 notification_registrar_.Add(this, NOTIFICATION_NAV_ENTRY_PENDING, |
| 256 Source<NavigationController>(controller_)); | 256 Source<NavigationController>(controller_)); |
| 257 } | 257 } |
| 258 | 258 |
| 259 void InterstitialPageImpl::Hide() { | 259 void InterstitialPageImpl::Hide() { |
| 260 // We may have already been hidden, and are just waiting to be deleted. | 260 // We may have already been hidden, and are just waiting to be deleted. |
| 261 // We can't check for enabled() here, because some callers have already | 261 // We can't check for enabled() here, because some callers have already |
| 262 // called Disable. | 262 // called Disable. |
| 263 if (!render_view_host_) | 263 if (!render_view_host_) |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 912 | 912 |
| 913 web_contents->GetDelegateView()->TakeFocus(reverse); | 913 web_contents->GetDelegateView()->TakeFocus(reverse); |
| 914 } | 914 } |
| 915 | 915 |
| 916 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( | 916 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( |
| 917 int request_id, int number_of_matches, const gfx::Rect& selection_rect, | 917 int request_id, int number_of_matches, const gfx::Rect& selection_rect, |
| 918 int active_match_ordinal, bool final_update) { | 918 int active_match_ordinal, bool final_update) { |
| 919 } | 919 } |
| 920 | 920 |
| 921 } // namespace content | 921 } // namespace content |
| OLD | NEW |