| Index: content/browser/frame_host/frame_tree.h
|
| diff --git a/content/browser/frame_host/frame_tree.h b/content/browser/frame_host/frame_tree.h
|
| index 840228d412d4c4128a25a4b8742f93bc78c5f961..412bb2ca024fb31504fbb33ced0ba5a508cf463e 100644
|
| --- a/content/browser/frame_host/frame_tree.h
|
| +++ b/content/browser/frame_host/frame_tree.h
|
| @@ -140,7 +140,7 @@ class CONTENT_EXPORT FrameTree {
|
| // for an opener's frame tree), in which case no nodes are skipped for
|
| // RenderFrameProxyHost creation.
|
| void CreateProxiesForSiteInstance(FrameTreeNode* source,
|
| - SiteInstance* site_instance);
|
| + SiteInstanceImpl* site_instance);
|
|
|
| // Convenience accessor for the main frame's RenderFrameHostImpl.
|
| RenderFrameHostImpl* GetMainFrame() const;
|
| @@ -153,7 +153,7 @@ class CONTENT_EXPORT FrameTree {
|
| // other than |source|, those SiteInstances will be notified about the new
|
| // focused frame. Note that |source| may differ from |node|'s current
|
| // SiteInstance (e.g., this happens for cross-process window.focus() calls).
|
| - void SetFocusedFrame(FrameTreeNode* node, SiteInstance* source);
|
| + void SetFocusedFrame(FrameTreeNode* node, SiteInstanceImpl* source);
|
|
|
| // Allows a client to listen for frame removal. The listener should expect
|
| // to receive the RenderViewHostImpl containing the frame and the renderer-
|
| @@ -164,7 +164,7 @@ class CONTENT_EXPORT FrameTree {
|
| // Creates a RenderViewHost for a new RenderFrameHost in the given
|
| // |site_instance|. The RenderViewHost will have its Shutdown method called
|
| // when all of the RenderFrameHosts using it are deleted.
|
| - RenderViewHostImpl* CreateRenderViewHost(SiteInstance* site_instance,
|
| + RenderViewHostImpl* CreateRenderViewHost(SiteInstanceImpl* site_instance,
|
| int32_t routing_id,
|
| int32_t main_frame_routing_id,
|
| bool swapped_out,
|
| @@ -173,7 +173,7 @@ class CONTENT_EXPORT FrameTree {
|
| // Returns the existing RenderViewHost for a new RenderFrameHost.
|
| // There should always be such a RenderViewHost, because the main frame
|
| // RenderFrameHost for each SiteInstance should be created before subframes.
|
| - RenderViewHostImpl* GetRenderViewHost(SiteInstance* site_instance);
|
| + RenderViewHostImpl* GetRenderViewHost(SiteInstanceImpl* site_instance);
|
|
|
| // Keeps track of which RenderFrameHosts and RenderFrameProxyHosts are using
|
| // each RenderViewHost. When the number drops to zero, we call Shutdown on
|
| @@ -205,7 +205,7 @@ class CONTENT_EXPORT FrameTree {
|
|
|
| // Updates page-level focus for this FrameTree in the subframe renderer
|
| // identified by |instance|.
|
| - void SetPageFocus(SiteInstance* instance, bool is_focused);
|
| + void SetPageFocus(SiteInstanceImpl* instance, bool is_focused);
|
|
|
| private:
|
| friend class FrameTreeTest;
|
|
|