| 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 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "content/browser/frame_host/navigation_controller_impl.h" | 9 #include "content/browser/frame_host/navigation_controller_impl.h" |
| 10 #include "content/browser/frame_host/navigator.h" | 10 #include "content/browser/frame_host/navigator.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 const FrameHostMsg_DidCommitProvisionalLoad_Params& | 48 const FrameHostMsg_DidCommitProvisionalLoad_Params& |
| 49 input_params) OVERRIDE; | 49 input_params) OVERRIDE; |
| 50 virtual bool NavigateToPendingEntry( | 50 virtual bool NavigateToPendingEntry( |
| 51 RenderFrameHostImpl* render_frame_host, | 51 RenderFrameHostImpl* render_frame_host, |
| 52 NavigationController::ReloadType reload_type) OVERRIDE; | 52 NavigationController::ReloadType reload_type) OVERRIDE; |
| 53 virtual base::TimeTicks GetCurrentLoadStart() OVERRIDE; | 53 virtual base::TimeTicks GetCurrentLoadStart() OVERRIDE; |
| 54 virtual void RequestOpenURL(RenderFrameHostImpl* render_frame_host, | 54 virtual void RequestOpenURL(RenderFrameHostImpl* render_frame_host, |
| 55 const GURL& url, | 55 const GURL& url, |
| 56 const Referrer& referrer, | 56 const Referrer& referrer, |
| 57 WindowOpenDisposition disposition, | 57 WindowOpenDisposition disposition, |
| 58 int64 source_frame_id, | |
| 59 bool should_replace_current_entry, | 58 bool should_replace_current_entry, |
| 60 bool user_gesture) OVERRIDE; | 59 bool user_gesture) OVERRIDE; |
| 61 virtual void RequestTransferURL( | 60 virtual void RequestTransferURL( |
| 62 RenderFrameHostImpl* render_frame_host, | 61 RenderFrameHostImpl* render_frame_host, |
| 63 const GURL& url, | 62 const GURL& url, |
| 64 const std::vector<GURL>& redirect_chain, | 63 const std::vector<GURL>& redirect_chain, |
| 65 const Referrer& referrer, | 64 const Referrer& referrer, |
| 66 PageTransition page_transition, | 65 PageTransition page_transition, |
| 67 WindowOpenDisposition disposition, | 66 WindowOpenDisposition disposition, |
| 68 int64 source_frame_id, | |
| 69 const GlobalRequestID& transferred_global_request_id, | 67 const GlobalRequestID& transferred_global_request_id, |
| 70 bool should_replace_current_entry, | 68 bool should_replace_current_entry, |
| 71 bool user_gesture) OVERRIDE; | 69 bool user_gesture) OVERRIDE; |
| 72 | 70 |
| 73 private: | 71 private: |
| 74 virtual ~NavigatorImpl() {} | 72 virtual ~NavigatorImpl() {} |
| 75 | 73 |
| 76 // Navigates to the given entry, which must be the pending entry. Private | 74 // Navigates to the given entry, which must be the pending entry. Private |
| 77 // because all callers should use NavigateToPendingEntry. | 75 // because all callers should use NavigateToPendingEntry. |
| 78 bool NavigateToEntry( | 76 bool NavigateToEntry( |
| (...skipping 15 matching lines...) Expand all Loading... |
| 94 | 92 |
| 95 // System time at which the current load was started. | 93 // System time at which the current load was started. |
| 96 base::TimeTicks current_load_start_; | 94 base::TimeTicks current_load_start_; |
| 97 | 95 |
| 98 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); | 96 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); |
| 99 }; | 97 }; |
| 100 | 98 |
| 101 } // namespace content | 99 } // namespace content |
| 102 | 100 |
| 103 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ | 101 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ |
| OLD | NEW |