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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2625633002: Supporting changes in preparation of browser side mixed content checking. (Closed)
Patch Set: Address code review comments. 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 | « content/common/resource_request.h ('k') | content/renderer/render_view_browsertest.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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 6191 matching lines...) Expand 10 before | Expand all | Expand 10 after
6202 base::Optional<url::Origin> initiator_origin = 6202 base::Optional<url::Origin> initiator_origin =
6203 info.urlRequest.requestorOrigin().isNull() 6203 info.urlRequest.requestorOrigin().isNull()
6204 ? base::Optional<url::Origin>() 6204 ? base::Optional<url::Origin>()
6205 : base::Optional<url::Origin>(info.urlRequest.requestorOrigin()); 6205 : base::Optional<url::Origin>(info.urlRequest.requestorOrigin());
6206 BeginNavigationParams begin_navigation_params( 6206 BeginNavigationParams begin_navigation_params(
6207 GetWebURLRequestHeaders(info.urlRequest), 6207 GetWebURLRequestHeaders(info.urlRequest),
6208 GetLoadFlagsForWebURLRequest(info.urlRequest), 6208 GetLoadFlagsForWebURLRequest(info.urlRequest),
6209 info.urlRequest.hasUserGesture(), 6209 info.urlRequest.hasUserGesture(),
6210 info.urlRequest.skipServiceWorker() != 6210 info.urlRequest.skipServiceWorker() !=
6211 blink::WebURLRequest::SkipServiceWorker::None, 6211 blink::WebURLRequest::SkipServiceWorker::None,
6212 GetRequestContextTypeForWebURLRequest(info.urlRequest), initiator_origin); 6212 GetRequestContextTypeForWebURLRequest(info.urlRequest),
6213 GetMixedContentContextTypeForWebURLRequest(info.urlRequest),
6214 initiator_origin);
6213 6215
6214 if (!info.form.isNull()) { 6216 if (!info.form.isNull()) {
6215 WebSearchableFormData web_searchable_form_data(info.form); 6217 WebSearchableFormData web_searchable_form_data(info.form);
6216 begin_navigation_params.searchable_form_url = 6218 begin_navigation_params.searchable_form_url =
6217 web_searchable_form_data.url(); 6219 web_searchable_form_data.url();
6218 begin_navigation_params.searchable_form_encoding = 6220 begin_navigation_params.searchable_form_encoding =
6219 web_searchable_form_data.encoding().utf8(); 6221 web_searchable_form_data.encoding().utf8();
6220 } 6222 }
6221 6223
6222 Send(new FrameHostMsg_BeginNavigation( 6224 Send(new FrameHostMsg_BeginNavigation(
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
6776 // event target. Potentially a Pepper plugin will receive the event. 6778 // event target. Potentially a Pepper plugin will receive the event.
6777 // In order to tell whether a plugin gets the last mouse event and which it 6779 // In order to tell whether a plugin gets the last mouse event and which it
6778 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6780 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6779 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6781 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6780 // |pepper_last_mouse_event_target_|. 6782 // |pepper_last_mouse_event_target_|.
6781 pepper_last_mouse_event_target_ = nullptr; 6783 pepper_last_mouse_event_target_ = nullptr;
6782 #endif 6784 #endif
6783 } 6785 }
6784 6786
6785 } // namespace content 6787 } // namespace content
OLDNEW
« no previous file with comments | « content/common/resource_request.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698