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

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

Issue 182713005: Remove frame ID from DidCommitProvisionalLoad. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix John's comments and signin test Created 6 years, 9 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 | Annotate | Revision Log
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 <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 20 matching lines...) Expand all
31 class RenderViewHostImpl; 31 class RenderViewHostImpl;
32 struct ContextMenuParams; 32 struct ContextMenuParams;
33 33
34 class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost { 34 class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
35 public: 35 public:
36 static RenderFrameHostImpl* FromID(int process_id, int routing_id); 36 static RenderFrameHostImpl* FromID(int process_id, int routing_id);
37 37
38 virtual ~RenderFrameHostImpl(); 38 virtual ~RenderFrameHostImpl();
39 39
40 // RenderFrameHost 40 // RenderFrameHost
41 virtual int GetRoutingID() OVERRIDE;
41 virtual SiteInstance* GetSiteInstance() OVERRIDE; 42 virtual SiteInstance* GetSiteInstance() OVERRIDE;
42 virtual RenderProcessHost* GetProcess() OVERRIDE; 43 virtual RenderProcessHost* GetProcess() OVERRIDE;
43 virtual int GetRoutingID() OVERRIDE;
44 virtual RenderFrameHost* GetParent() OVERRIDE; 44 virtual RenderFrameHost* GetParent() OVERRIDE;
45 virtual bool IsCrossProcessSubframe() OVERRIDE; 45 virtual bool IsCrossProcessSubframe() OVERRIDE;
46 virtual GURL GetLastCommittedURL() OVERRIDE; 46 virtual GURL GetLastCommittedURL() OVERRIDE;
47 virtual gfx::NativeView GetNativeView() OVERRIDE; 47 virtual gfx::NativeView GetNativeView() OVERRIDE;
48 virtual void NotifyContextMenuClosed( 48 virtual void NotifyContextMenuClosed(
49 const CustomContextMenuContext& context) OVERRIDE; 49 const CustomContextMenuContext& context) OVERRIDE;
50 virtual void ExecuteCustomContextMenuCommand( 50 virtual void ExecuteCustomContextMenuCommand(
51 int action, const CustomContextMenuContext& context) OVERRIDE; 51 int action, const CustomContextMenuContext& context) OVERRIDE;
52 virtual RenderViewHost* GetRenderViewHost() OVERRIDE; 52 virtual RenderViewHost* GetRenderViewHost() OVERRIDE;
53 53
(...skipping 17 matching lines...) Expand all
71 // |cross_process_frame_connector| allows the non-swapped-out 71 // |cross_process_frame_connector| allows the non-swapped-out
72 // RenderFrameHost for a frame to communicate with the parent process 72 // RenderFrameHost for a frame to communicate with the parent process
73 // so that it may composite drawing data. 73 // so that it may composite drawing data.
74 // 74 //
75 // Ownership is not transfered. 75 // Ownership is not transfered.
76 void set_cross_process_frame_connector( 76 void set_cross_process_frame_connector(
77 CrossProcessFrameConnector* cross_process_frame_connector) { 77 CrossProcessFrameConnector* cross_process_frame_connector) {
78 cross_process_frame_connector_ = cross_process_frame_connector; 78 cross_process_frame_connector_ = cross_process_frame_connector;
79 } 79 }
80 80
81 // Returns a bitwise OR of bindings types that have been enabled for this
82 // RenderFrameHostImpl's RenderView. See BindingsPolicy for details.
83 // TODO(creis): Make bindings frame-specific, to support cases like <webview>.
84 int GetEnabledBindings();
85
81 // Hack to get this subframe to swap out, without yet moving over all the 86 // Hack to get this subframe to swap out, without yet moving over all the
82 // SwapOut state and machinery from RenderViewHost. 87 // SwapOut state and machinery from RenderViewHost.
83 void SwapOut(); 88 void SwapOut();
84 void OnSwappedOut(bool timed_out); 89 void OnSwappedOut(bool timed_out);
85 bool is_swapped_out() { return is_swapped_out_; } 90 bool is_swapped_out() { return is_swapped_out_; }
86 void set_swapped_out(bool is_swapped_out) { 91 void set_swapped_out(bool is_swapped_out) {
87 is_swapped_out_ = is_swapped_out; 92 is_swapped_out_ = is_swapped_out;
88 } 93 }
89 94
90 // Sets the RVH for |this| as pending shutdown. |on_swap_out| will be called 95 // Sets the RVH for |this| as pending shutdown. |on_swap_out| will be called
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 186
182 int routing_id_; 187 int routing_id_;
183 bool is_swapped_out_; 188 bool is_swapped_out_;
184 189
185 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 190 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
186 }; 191 };
187 192
188 } // namespace content 193 } // namespace content
189 194
190 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 195 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698