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

Side by Side Diff: content/renderer/render_frame_proxy.h

Issue 2046733003: Replicate WebInsecureRequestPolicy instead of a bool for strict mixed content checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@securitycontext
Patch Set: Created 4 years, 6 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
OLDNEW
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_RENDERER_RENDER_FRAME_PROXY_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
11 #include "ipc/ipc_listener.h" 11 #include "ipc/ipc_listener.h"
12 #include "ipc/ipc_sender.h" 12 #include "ipc/ipc_sender.h"
13 #include "third_party/WebKit/public/platform/WebFocusType.h" 13 #include "third_party/WebKit/public/platform/WebFocusType.h"
14 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h"
14 #include "third_party/WebKit/public/web/WebRemoteFrame.h" 15 #include "third_party/WebKit/public/web/WebRemoteFrame.h"
15 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h" 16 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h"
16 #include "url/origin.h" 17 #include "url/origin.h"
17 18
18 struct FrameMsg_BuffersSwapped_Params; 19 struct FrameMsg_BuffersSwapped_Params;
19 struct FrameMsg_CompositorFrameSwapped_Params; 20 struct FrameMsg_CompositorFrameSwapped_Params;
20 21
21 namespace blink { 22 namespace blink {
22 class WebInputEvent; 23 class WebInputEvent;
23 struct WebRect; 24 struct WebRect;
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 const gfx::Size& frame_size, 162 const gfx::Size& frame_size,
162 float scale_factor, 163 float scale_factor,
163 const cc::SurfaceSequence& sequence); 164 const cc::SurfaceSequence& sequence);
164 void OnUpdateOpener(int opener_routing_id); 165 void OnUpdateOpener(int opener_routing_id);
165 void OnDidStopLoading(); 166 void OnDidStopLoading();
166 void OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags); 167 void OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags);
167 void OnDispatchLoad(); 168 void OnDispatchLoad();
168 void OnDidUpdateName(const std::string& name, const std::string& unique_name); 169 void OnDidUpdateName(const std::string& name, const std::string& unique_name);
169 void OnAddContentSecurityPolicy(const ContentSecurityPolicyHeader& header); 170 void OnAddContentSecurityPolicy(const ContentSecurityPolicyHeader& header);
170 void OnResetContentSecurityPolicy(); 171 void OnResetContentSecurityPolicy();
171 void OnEnforceStrictMixedContentChecking(bool should_enforce); 172 void OnEnforceInsecureRequestPolicy(
173 blink::WebInsecureRequestPolicy should_enforce);
alexmos 2016/06/07 19:00:06 s/should_enforce/policy/
Mike West 2016/06/08 07:21:12 Done.
172 void OnSetFrameOwnerProperties( 174 void OnSetFrameOwnerProperties(
173 const blink::WebFrameOwnerProperties& properties); 175 const blink::WebFrameOwnerProperties& properties);
174 void OnDidUpdateOrigin(const url::Origin& origin, 176 void OnDidUpdateOrigin(const url::Origin& origin,
175 bool is_potentially_trustworthy_unique_origin); 177 bool is_potentially_trustworthy_unique_origin);
176 void OnSetPageFocus(bool is_focused); 178 void OnSetPageFocus(bool is_focused);
177 void OnSetFocusedFrame(); 179 void OnSetFocusedFrame();
178 void OnWillEnterFullscreen(); 180 void OnWillEnterFullscreen();
179 181
180 // The routing ID by which this RenderFrameProxy is known. 182 // The routing ID by which this RenderFrameProxy is known.
181 const int routing_id_; 183 const int routing_id_;
182 184
183 // The routing ID of the local RenderFrame (if any) which this 185 // The routing ID of the local RenderFrame (if any) which this
184 // RenderFrameProxy is meant to replace in the frame tree. 186 // RenderFrameProxy is meant to replace in the frame tree.
185 const int frame_routing_id_; 187 const int frame_routing_id_;
186 188
187 // Stores the WebRemoteFrame we are associated with. 189 // Stores the WebRemoteFrame we are associated with.
188 blink::WebRemoteFrame* web_frame_; 190 blink::WebRemoteFrame* web_frame_;
189 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_; 191 scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
190 192
191 RenderViewImpl* render_view_; 193 RenderViewImpl* render_view_;
192 RenderWidget* render_widget_; 194 RenderWidget* render_widget_;
193 195
194 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy); 196 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy);
195 }; 197 };
196 198
197 } // namespace 199 } // namespace
198 200
199 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ 201 #endif // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698