Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_NAVIGATION_REQUEST_INFO_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_INFO_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_INFO_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_INFO_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "content/common/frame_messages.h" | 11 #include "content/common/frame_messages.h" |
| 12 #include "content/common/navigation_params.h" | |
| 12 #include "content/public/common/page_transition_types.h" | 13 #include "content/public/common/page_transition_types.h" |
| 13 #include "content/public/common/referrer.h" | 14 #include "content/public/common/referrer.h" |
| 14 #include "url/gurl.h" | 15 #include "url/gurl.h" |
| 15 | 16 |
| 16 namespace content { | 17 namespace content { |
| 17 | 18 |
| 18 // A struct to hold the parameters needed to start a navigation request in | 19 // A struct to hold the parameters needed to start a navigation request in |
| 19 // ResourceDispatcherHost. It is initialized on the UI thread, and then passed | 20 // ResourceDispatcherHost. It is initialized on the UI thread, and then passed |
| 20 // to the IO thread by a NavigationRequest object. | 21 // to the IO thread by a NavigationRequest object. |
| 21 struct NavigationRequestInfo { | 22 struct NavigationRequestInfo { |
| 22 NavigationRequestInfo(const FrameHostMsg_BeginNavigation_Params& params); | 23 NavigationRequestInfo(const CoreNavigationParams& core_params, |
| 24 const FrameHostMsg_BeginNavigation_Params& params); | |
| 23 | 25 |
| 26 const CoreNavigationParams core_params; | |
| 24 const FrameHostMsg_BeginNavigation_Params navigation_params; | 27 const FrameHostMsg_BeginNavigation_Params navigation_params; |
| 25 | 28 |
| 26 // --------------------------------------------------------------------------- | 29 // --------------------------------------------------------------------------- |
| 27 // The following parameters should be filled in by RenderFrameHostManager | 30 // The following parameters should be filled in by RenderFrameHostManager |
| 28 // before the navigation request is sent to the ResourceDispatcherHost. | 31 // before the navigation request is sent to the ResourceDispatcherHost. |
| 29 | 32 |
| 30 // Usually the URL of the document in the top-level window, which may be | 33 // Usually the URL of the document in the top-level window, which may be |
| 31 // checked by the third-party cookie blocking policy. | 34 // checked by the third-party cookie blocking policy. |
| 32 GURL first_party_for_cookies; | 35 GURL first_party_for_cookies; |
| 33 bool is_main_frame; | 36 bool is_main_frame; |
| 34 bool parent_is_main_frame; | 37 bool parent_is_main_frame; |
| 38 | |
| 39 // Whether or not we should allow the URL to download (true by default). | |
|
Charlie Reis
2014/09/19 23:12:31
Ah, I see the point of confusion now. This descri
| |
| 40 bool allow_download; | |
|
Charlie Reis
2014/09/19 23:12:31
I still don't follow why this was moved from Frame
clamy
2014/09/23 21:13:25
Ah it got lost in the moving of parameters. It is
| |
| 35 }; | 41 }; |
| 36 | 42 |
| 37 } // namespace content | 43 } // namespace content |
| 38 | 44 |
| 39 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_INFO_H_ | 45 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_INFO_H_ |
| OLD | NEW |