Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(525)

Side by Side Diff: content/browser/frame_host/navigator_impl.h

Issue 2419093002: Revert of Preserving Content-Type header from http request in OpenURL path. (Closed)
Patch Set: Manually resolved conflicts with r425338 in navigator_impl.cc. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/frame_host/navigator.h ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <memory> 8 #include <memory>
9 9
10 #include "base/containers/scoped_ptr_hash_map.h" 10 #include "base/containers/scoped_ptr_hash_map.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 bool NavigateToPendingEntry(FrameTreeNode* frame_tree_node, 60 bool NavigateToPendingEntry(FrameTreeNode* frame_tree_node,
61 const FrameNavigationEntry& frame_entry, 61 const FrameNavigationEntry& frame_entry,
62 ReloadType reload_type, 62 ReloadType reload_type,
63 bool is_same_document_history_load) override; 63 bool is_same_document_history_load) override;
64 bool NavigateNewChildFrame(RenderFrameHostImpl* render_frame_host, 64 bool NavigateNewChildFrame(RenderFrameHostImpl* render_frame_host,
65 const GURL& default_url) override; 65 const GURL& default_url) override;
66 void RequestOpenURL(RenderFrameHostImpl* render_frame_host, 66 void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
67 const GURL& url, 67 const GURL& url,
68 bool uses_post, 68 bool uses_post,
69 const scoped_refptr<ResourceRequestBodyImpl>& body, 69 const scoped_refptr<ResourceRequestBodyImpl>& body,
70 const std::string& extra_headers,
71 SiteInstance* source_site_instance, 70 SiteInstance* source_site_instance,
72 const Referrer& referrer, 71 const Referrer& referrer,
73 WindowOpenDisposition disposition, 72 WindowOpenDisposition disposition,
74 bool should_replace_current_entry, 73 bool should_replace_current_entry,
75 bool user_gesture) override; 74 bool user_gesture) override;
76 void RequestTransferURL(RenderFrameHostImpl* render_frame_host, 75 void RequestTransferURL(
77 const GURL& url, 76 RenderFrameHostImpl* render_frame_host,
78 SiteInstance* source_site_instance, 77 const GURL& url,
79 const std::vector<GURL>& redirect_chain, 78 SiteInstance* source_site_instance,
80 const Referrer& referrer, 79 const std::vector<GURL>& redirect_chain,
81 ui::PageTransition page_transition, 80 const Referrer& referrer,
82 const GlobalRequestID& transferred_global_request_id, 81 ui::PageTransition page_transition,
83 bool should_replace_current_entry, 82 const GlobalRequestID& transferred_global_request_id,
84 const std::string& method, 83 bool should_replace_current_entry,
85 scoped_refptr<ResourceRequestBodyImpl> post_body, 84 const std::string& method,
86 const std::string& extra_headers) override; 85 scoped_refptr<ResourceRequestBodyImpl> post_body) override;
87 void OnBeforeUnloadACK(FrameTreeNode* frame_tree_node, bool proceed) override; 86 void OnBeforeUnloadACK(FrameTreeNode* frame_tree_node, bool proceed) override;
88 void OnBeginNavigation(FrameTreeNode* frame_tree_node, 87 void OnBeginNavigation(FrameTreeNode* frame_tree_node,
89 const CommonNavigationParams& common_params, 88 const CommonNavigationParams& common_params,
90 const BeginNavigationParams& begin_params) override; 89 const BeginNavigationParams& begin_params) override;
91 void FailedNavigation(FrameTreeNode* frame_tree_node, 90 void FailedNavigation(FrameTreeNode* frame_tree_node,
92 bool has_stale_copy_in_cache, 91 bool has_stale_copy_in_cache,
93 int error_code) override; 92 int error_code) override;
94 void LogResourceRequestTime(base::TimeTicks timestamp, 93 void LogResourceRequestTime(base::TimeTicks timestamp,
95 const GURL& url) override; 94 const GURL& url) override;
96 void LogBeforeUnloadTime( 95 void LogBeforeUnloadTime(
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 NavigatorDelegate* delegate_; 158 NavigatorDelegate* delegate_;
160 159
161 std::unique_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_; 160 std::unique_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_;
162 161
163 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); 162 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
164 }; 163 };
165 164
166 } // namespace content 165 } // namespace content
167 166
168 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 167 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigator.h ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698