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

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

Issue 1489253002: Plumb document's strict mixed content checking for RemoteFrames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: alexmos test comments Created 5 years 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 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_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 FrameTreeNode* frame_tree_node, 526 FrameTreeNode* frame_tree_node,
527 int32 routing_id, 527 int32 routing_id,
528 int32 widget_routing_id, 528 int32 widget_routing_id,
529 int flags); 529 int flags);
530 530
531 private: 531 private:
532 friend class TestRenderFrameHost; 532 friend class TestRenderFrameHost;
533 friend class TestRenderViewHost; 533 friend class TestRenderViewHost;
534 534
535 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, CrashSubframe); 535 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, CrashSubframe);
536 FRIEND_TEST_ALL_PREFIXES(
537 RenderFrameHostManagerTestWithSiteIsolation,
538 ProxiesReceiveShouldEnforceStrictMixedContentChecking);
alexmos 2015/12/15 17:49:16 nit: it's probably a bit cleaner to plumb the OnDi
estark 2015/12/15 21:28:49 Done.
536 539
537 // IPC Message handlers. 540 // IPC Message handlers.
538 void OnAddMessageToConsole(int32 level, 541 void OnAddMessageToConsole(int32 level,
539 const base::string16& message, 542 const base::string16& message,
540 int32 line_no, 543 int32 line_no,
541 const base::string16& source_id); 544 const base::string16& source_id);
542 void OnDetach(); 545 void OnDetach();
543 void OnFrameFocused(); 546 void OnFrameFocused();
544 void OnOpenURL(const FrameHostMsg_OpenURL_Params& params); 547 void OnOpenURL(const FrameHostMsg_OpenURL_Params& params);
545 void OnDocumentOnLoadCompleted( 548 void OnDocumentOnLoadCompleted(
(...skipping 29 matching lines...) Expand all
575 void OnRunBeforeUnloadConfirm(const GURL& frame_url, 578 void OnRunBeforeUnloadConfirm(const GURL& frame_url,
576 const base::string16& message, 579 const base::string16& message,
577 bool is_reload, 580 bool is_reload,
578 IPC::Message* reply_msg); 581 IPC::Message* reply_msg);
579 void OnTextSurroundingSelectionResponse(const base::string16& content, 582 void OnTextSurroundingSelectionResponse(const base::string16& content,
580 size_t start_offset, 583 size_t start_offset,
581 size_t end_offset); 584 size_t end_offset);
582 void OnDidAccessInitialDocument(); 585 void OnDidAccessInitialDocument();
583 void OnDidChangeOpener(int32 opener_routing_id); 586 void OnDidChangeOpener(int32 opener_routing_id);
584 void OnDidChangeName(const std::string& name); 587 void OnDidChangeName(const std::string& name);
588 void OnDidEnforceStrictMixedContentChecking();
585 void OnDidAssignPageId(int32 page_id); 589 void OnDidAssignPageId(int32 page_id);
586 void OnDidChangeSandboxFlags(int32 frame_routing_id, 590 void OnDidChangeSandboxFlags(int32 frame_routing_id,
587 blink::WebSandboxFlags flags); 591 blink::WebSandboxFlags flags);
588 void OnDidChangeFrameOwnerProperties( 592 void OnDidChangeFrameOwnerProperties(
589 int32 frame_routing_id, 593 int32 frame_routing_id,
590 const blink::WebFrameOwnerProperties& frame_owner_properties); 594 const blink::WebFrameOwnerProperties& frame_owner_properties);
591 void OnUpdateTitle(const base::string16& title, 595 void OnUpdateTitle(const base::string16& title,
592 blink::WebTextDirection title_direction); 596 blink::WebTextDirection title_direction);
593 void OnUpdateEncoding(const std::string& encoding); 597 void OnUpdateEncoding(const std::string& encoding);
594 void OnBeginNavigation(const CommonNavigationParams& common_params, 598 void OnBeginNavigation(const CommonNavigationParams& common_params,
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 877
874 // NOTE: This must be the last member. 878 // NOTE: This must be the last member.
875 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 879 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
876 880
877 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 881 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
878 }; 882 };
879 883
880 } // namespace content 884 } // namespace content
881 885
882 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 886 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698