| 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_navigator_impl.h" |   5 #include "content/browser/frame_host/interstitial_page_navigator_impl.h" | 
|   6  |   6  | 
|   7 #include "content/browser/frame_host/interstitial_page_impl.h" |   7 #include "content/browser/frame_host/interstitial_page_impl.h" | 
|   8 #include "content/browser/frame_host/navigation_controller_impl.h" |   8 #include "content/browser/frame_host/navigation_controller_impl.h" | 
|   9 #include "content/browser/frame_host/navigator_delegate.h" |   9 #include "content/browser/frame_host/navigator_delegate.h" | 
|  10 #include "content/browser/renderer_host/render_view_host_impl.h" |  10 #include "content/browser/renderer_host/render_view_host_impl.h" | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
|  23   return interstitial_; |  23   return interstitial_; | 
|  24 } |  24 } | 
|  25  |  25  | 
|  26 NavigationController* InterstitialPageNavigatorImpl::GetController() { |  26 NavigationController* InterstitialPageNavigatorImpl::GetController() { | 
|  27   return controller_; |  27   return controller_; | 
|  28 } |  28 } | 
|  29  |  29  | 
|  30 void InterstitialPageNavigatorImpl::DidStartProvisionalLoad( |  30 void InterstitialPageNavigatorImpl::DidStartProvisionalLoad( | 
|  31     RenderFrameHostImpl* render_frame_host, |  31     RenderFrameHostImpl* render_frame_host, | 
|  32     const GURL& url, |  32     const GURL& url, | 
 |  33     const std::vector<GURL>& redirect_chain, | 
|  33     const base::TimeTicks& navigation_start) { |  34     const base::TimeTicks& navigation_start) { | 
|  34   // The interstitial page should only navigate once. |  35   // The interstitial page should only navigate once. | 
|  35   DCHECK(!render_frame_host->navigation_handle()); |  36   DCHECK(!render_frame_host->navigation_handle()); | 
|  36   render_frame_host->SetNavigationHandle( |  37   render_frame_host->SetNavigationHandle( | 
|  37       NavigationHandleImpl::Create(url, render_frame_host->frame_tree_node(), |  38       NavigationHandleImpl::Create(url, redirect_chain, | 
 |  39                                    render_frame_host->frame_tree_node(), | 
|  38                                    false,  // is_renderer_initiated |  40                                    false,  // is_renderer_initiated | 
|  39                                    false,  // is_synchronous |  41                                    false,  // is_synchronous | 
|  40                                    navigation_start, |  42                                    navigation_start, | 
|  41                                    0,      // pending_nav_entry_id |  43                                    0,      // pending_nav_entry_id | 
|  42                                    false)  // started_in_context_menu |  44                                    false)  // started_in_context_menu | 
|  43       ); |  45       ); | 
|  44 } |  46 } | 
|  45  |  47  | 
|  46 void InterstitialPageNavigatorImpl::DidNavigate( |  48 void InterstitialPageNavigatorImpl::DidNavigate( | 
|  47     RenderFrameHostImpl* render_frame_host, |  49     RenderFrameHostImpl* render_frame_host, | 
|  48     const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params, |  50     const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params, | 
|  49     std::unique_ptr<NavigationHandleImpl> navigation_handle) { |  51     std::unique_ptr<NavigationHandleImpl> navigation_handle) { | 
|  50   navigation_handle->DidCommitNavigation(input_params, false, GURL(), |  52   navigation_handle->DidCommitNavigation(input_params, false, GURL(), | 
|  51                                          render_frame_host); |  53                                          render_frame_host); | 
|  52   navigation_handle.reset(); |  54   navigation_handle.reset(); | 
|  53  |  55  | 
|  54   // TODO(nasko): Move implementation here, but for the time being call out |  56   // TODO(nasko): Move implementation here, but for the time being call out | 
|  55   // to the interstitial page code. |  57   // to the interstitial page code. | 
|  56   interstitial_->DidNavigate(render_frame_host->render_view_host(), |  58   interstitial_->DidNavigate(render_frame_host->render_view_host(), | 
|  57                              input_params); |  59                              input_params); | 
|  58 } |  60 } | 
|  59  |  61  | 
|  60 }  // namespace content |  62 }  // namespace content | 
| OLD | NEW |