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

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

Issue 1544293002: Convert Pass()→std::move() in //content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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/child/process_control_impl.cc ('k') | content/child/resource_dispatcher.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>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "content/child/web_url_loader_impl.h" 12 #include "content/child/web_url_loader_impl.h"
11 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
12 #include "content/common/navigation_params.h" 14 #include "content/common/navigation_params.h"
13 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h" 15 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
14 #include "third_party/WebKit/public/platform/WebString.h" 16 #include "third_party/WebKit/public/platform/WebString.h"
15 #include "third_party/WebKit/public/platform/WebURLRequest.h" 17 #include "third_party/WebKit/public/platform/WebURLRequest.h"
16 #include "ui/base/page_transition_types.h" 18 #include "ui/base/page_transition_types.h"
17 19
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 const blink::WebString& requested_with() const { 109 const blink::WebString& requested_with() const {
108 return requested_with_; 110 return requested_with_;
109 } 111 }
110 void set_requested_with(const blink::WebString& requested_with) { 112 void set_requested_with(const blink::WebString& requested_with) {
111 requested_with_ = requested_with; 113 requested_with_ = requested_with;
112 } 114 }
113 115
114 // PlzNavigate: |stream_override| is used to override certain parameters of 116 // PlzNavigate: |stream_override| is used to override certain parameters of
115 // navigation requests. 117 // navigation requests.
116 scoped_ptr<StreamOverrideParameters> TakeStreamOverrideOwnership() { 118 scoped_ptr<StreamOverrideParameters> TakeStreamOverrideOwnership() {
117 return stream_override_.Pass(); 119 return std::move(stream_override_);
118 } 120 }
119 121
120 void set_stream_override( 122 void set_stream_override(
121 scoped_ptr<StreamOverrideParameters> stream_override) { 123 scoped_ptr<StreamOverrideParameters> stream_override) {
122 stream_override_ = stream_override.Pass(); 124 stream_override_ = std::move(stream_override);
123 } 125 }
124 126
125 private: 127 private:
126 blink::WebPageVisibilityState visibility_state_; 128 blink::WebPageVisibilityState visibility_state_;
127 int render_frame_id_; 129 int render_frame_id_;
128 bool is_main_frame_; 130 bool is_main_frame_;
129 GURL frame_origin_; 131 GURL frame_origin_;
130 bool parent_is_main_frame_; 132 bool parent_is_main_frame_;
131 int parent_render_frame_id_; 133 int parent_render_frame_id_;
132 bool allow_download_; 134 bool allow_download_;
133 ui::PageTransition transition_type_; 135 ui::PageTransition transition_type_;
134 bool should_replace_current_entry_; 136 bool should_replace_current_entry_;
135 int transferred_request_child_id_; 137 int transferred_request_child_id_;
136 int transferred_request_request_id_; 138 int transferred_request_request_id_;
137 int service_worker_provider_id_; 139 int service_worker_provider_id_;
138 blink::WebString custom_user_agent_; 140 blink::WebString custom_user_agent_;
139 blink::WebString requested_with_; 141 blink::WebString requested_with_;
140 scoped_ptr<StreamOverrideParameters> stream_override_; 142 scoped_ptr<StreamOverrideParameters> stream_override_;
141 LoFiState lofi_state_; 143 LoFiState lofi_state_;
142 144
143 DISALLOW_COPY_AND_ASSIGN(RequestExtraData); 145 DISALLOW_COPY_AND_ASSIGN(RequestExtraData);
144 }; 146 };
145 147
146 } // namespace content 148 } // namespace content
147 149
148 #endif // CONTENT_CHILD_REQUEST_EXTRA_DATA_H_ 150 #endif // CONTENT_CHILD_REQUEST_EXTRA_DATA_H_
OLDNEW
« no previous file with comments | « content/child/process_control_impl.cc ('k') | content/child/resource_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698