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

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

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Pass through FrameReplicationState 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
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_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <list> 10 #include <list>
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 } 502 }
503 503
504 // SiteInstanceImpl::Observer 504 // SiteInstanceImpl::Observer
505 void ActiveFrameCountIsZero(SiteInstanceImpl* site_instance) override; 505 void ActiveFrameCountIsZero(SiteInstanceImpl* site_instance) override;
506 void RenderProcessGone(SiteInstanceImpl* site_instance) override; 506 void RenderProcessGone(SiteInstanceImpl* site_instance) override;
507 507
508 // Cancels and destroys the pending or speculative RenderFrameHost if they 508 // Cancels and destroys the pending or speculative RenderFrameHost if they
509 // match the provided |render_frame_host|. 509 // match the provided |render_frame_host|.
510 void CancelPendingIfNecessary(RenderFrameHostImpl* render_frame_host); 510 void CancelPendingIfNecessary(RenderFrameHostImpl* render_frame_host);
511 511
512 void OnSetHasReceivedUserGesture();
513
512 // Sets up the necessary state for a new RenderViewHost. If |proxy| is not 514 // Sets up the necessary state for a new RenderViewHost. If |proxy| is not
513 // null, it creates a RenderFrameProxy in the target renderer process which is 515 // null, it creates a RenderFrameProxy in the target renderer process which is
514 // used to route IPC messages when in swapped out state. Returns early if the 516 // used to route IPC messages when in swapped out state. Returns early if the
515 // RenderViewHost has already been initialized for another RenderFrameHost. 517 // RenderViewHost has already been initialized for another RenderFrameHost.
516 bool InitRenderView(RenderViewHostImpl* render_view_host, 518 bool InitRenderView(RenderViewHostImpl* render_view_host,
517 RenderFrameProxyHost* proxy); 519 RenderFrameProxyHost* proxy);
518 520
519 private: 521 private:
520 friend class NavigatorTestWithBrowserSideNavigation; 522 friend class NavigatorTestWithBrowserSideNavigation;
521 friend class RenderFrameHostManagerTest; 523 friend class RenderFrameHostManagerTest;
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 std::unique_ptr<RenderFrameHostImpl> speculative_render_frame_host_; 806 std::unique_ptr<RenderFrameHostImpl> speculative_render_frame_host_;
805 807
806 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 808 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
807 809
808 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 810 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
809 }; 811 };
810 812
811 } // namespace content 813 } // namespace content
812 814
813 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 815 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698