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

Side by Side Diff: content/child/request_extra_data.h

Issue 2652123002: PlzNavigate: Attempt to fix blink layout tests which fail due to duplicate output from WebFrameClie… (Closed)
Patch Set: Fix redness Created 3 years, 11 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 | « components/test_runner/web_test_delegate.h ('k') | content/child/request_extra_data.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CHILD_REQUEST_EXTRA_DATA_H_ 5 #ifndef CONTENT_CHILD_REQUEST_EXTRA_DATA_H_
6 #define CONTENT_CHILD_REQUEST_EXTRA_DATA_H_ 6 #define CONTENT_CHILD_REQUEST_EXTRA_DATA_H_
7 7
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 // Copy of the settings value determining if mixed plugin content should be 152 // Copy of the settings value determining if mixed plugin content should be
153 // blocked. 153 // blocked.
154 bool block_mixed_plugin_content() const { 154 bool block_mixed_plugin_content() const {
155 return block_mixed_plugin_content_; 155 return block_mixed_plugin_content_;
156 } 156 }
157 void set_block_mixed_plugin_content(bool block_mixed_plugin_content) { 157 void set_block_mixed_plugin_content(bool block_mixed_plugin_content) {
158 block_mixed_plugin_content_ = block_mixed_plugin_content; 158 block_mixed_plugin_content_ = block_mixed_plugin_content;
159 } 159 }
160 160
161 // PlzNavigate
162 // Indicates whether a navigation was initiated by the browser or renderer.
163 bool navigation_initiated_by_renderer() const {
164 return navigation_initiated_by_renderer_;
165 }
166 void set_navigation_initiated_by_renderer(bool navigation_by_renderer) {
167 navigation_initiated_by_renderer_ = navigation_by_renderer;
168 }
169
161 void CopyToResourceRequest(ResourceRequest* request) const; 170 void CopyToResourceRequest(ResourceRequest* request) const;
162 171
163 private: 172 private:
164 blink::WebPageVisibilityState visibility_state_; 173 blink::WebPageVisibilityState visibility_state_;
165 int render_frame_id_; 174 int render_frame_id_;
166 bool is_main_frame_; 175 bool is_main_frame_;
167 url::Origin frame_origin_; 176 url::Origin frame_origin_;
168 bool parent_is_main_frame_; 177 bool parent_is_main_frame_;
169 int parent_render_frame_id_; 178 int parent_render_frame_id_;
170 bool allow_download_; 179 bool allow_download_;
171 ui::PageTransition transition_type_; 180 ui::PageTransition transition_type_;
172 bool should_replace_current_entry_; 181 bool should_replace_current_entry_;
173 int transferred_request_child_id_; 182 int transferred_request_child_id_;
174 int transferred_request_request_id_; 183 int transferred_request_request_id_;
175 int service_worker_provider_id_; 184 int service_worker_provider_id_;
176 bool originated_from_service_worker_; 185 bool originated_from_service_worker_;
177 blink::WebString custom_user_agent_; 186 blink::WebString custom_user_agent_;
178 blink::WebString requested_with_; 187 blink::WebString requested_with_;
179 std::unique_ptr<StreamOverrideParameters> stream_override_; 188 std::unique_ptr<StreamOverrideParameters> stream_override_;
180 bool initiated_in_secure_context_; 189 bool initiated_in_secure_context_;
181 bool is_prefetch_; 190 bool is_prefetch_;
182 bool download_to_network_cache_only_; 191 bool download_to_network_cache_only_;
183 bool block_mixed_plugin_content_; 192 bool block_mixed_plugin_content_;
193 bool navigation_initiated_by_renderer_;
184 194
185 DISALLOW_COPY_AND_ASSIGN(RequestExtraData); 195 DISALLOW_COPY_AND_ASSIGN(RequestExtraData);
186 }; 196 };
187 197
188 } // namespace content 198 } // namespace content
189 199
190 #endif // CONTENT_CHILD_REQUEST_EXTRA_DATA_H_ 200 #endif // CONTENT_CHILD_REQUEST_EXTRA_DATA_H_
OLDNEW
« no previous file with comments | « components/test_runner/web_test_delegate.h ('k') | content/child/request_extra_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698