Chromium Code Reviews| Index: content/browser/web_contents/web_contents_impl.h |
| diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h |
| index b0ebb5edc9543ac7ea95d2dd76e7d5e856667a3f..00624ad0a146fdd563ca435b015d3bc6170e79d4 100644 |
| --- a/content/browser/web_contents/web_contents_impl.h |
| +++ b/content/browser/web_contents/web_contents_impl.h |
| @@ -276,6 +276,9 @@ class CONTENT_EXPORT WebContentsImpl |
| void WasHidden() override; |
| bool NeedToFireBeforeUnload() override; |
| void DispatchBeforeUnload(bool for_cross_site_transition) override; |
| + void AttachToOuterWebContentsFrame( |
| + WebContents* outer_web_contents, |
| + RenderFrameHost* outer_contents_frame) override; |
| void Stop() override; |
| WebContents* Clone() override; |
| void ReloadFocusedFrame(bool ignore_cache) override; |
| @@ -591,6 +594,7 @@ class CONTENT_EXPORT WebContentsImpl |
| bool FocusLocationBarByDefault() override; |
| void SetFocusToLocationBar(bool select_all) override; |
| bool IsHidden() override; |
| + int GetOuterWebContentsFrameTreeNodeID() override; |
| // NotificationObserver ------------------------------------------------------ |
| @@ -722,6 +726,27 @@ class CONTENT_EXPORT WebContentsImpl |
| class DestructionObserver; |
| + // Represents a WebContents node in a tree of WebContents structure. |
| + // |
| + // Two WebContents with separate FrameTree can be connected by |
|
Charlie Reis
2015/05/22 23:44:31
FrameTrees
lazyboy
2015/05/26 16:32:55
Done.
|
| + // outer/inner relationship using this class. Note that their FrameTrees |
| + // still remain disjoint/separate. |
|
nasko
2015/05/22 16:32:28
nit: Drop the "/separate", one word should be enou
lazyboy
2015/05/26 16:32:55
Done.
|
| + // The root is referred to as "outer WebContents" and the descendents are |
|
nasko
2015/05/22 16:32:27
Where is "root" used?
lazyboy
2015/05/26 16:32:55
I meant the root of this tree structure, not in co
|
| + // referred to as "inner WebContents". |
| + struct WebContentsTreeNode { |
| + public: |
| + WebContentsTreeNode(); |
| + ~WebContentsTreeNode(); |
| + |
| + void set_parent_web_contents(WebContentsImpl* parent_web_contents) { |
|
nasko
2015/05/22 16:32:28
nit: s/parent/outer/ in this entire class.
lazyboy
2015/05/26 16:32:55
Done.
|
| + parent_web_contents_ = parent_web_contents; |
| + } |
| + WebContentsImpl* parent_web_contents() { return parent_web_contents_; } |
| + |
| + private: |
| + WebContentsImpl* parent_web_contents_; |
| + }; |
| + |
| // See WebContents::Create for a description of these parameters. |
| WebContentsImpl(BrowserContext* browser_context, |
| WebContentsImpl* opener); |
| @@ -1036,6 +1061,10 @@ class CONTENT_EXPORT WebContentsImpl |
| // Manages the frame tree of the page and process swaps in each node. |
| FrameTree frame_tree_; |
| + // If this WebContents is part of a "tree of WebContents" structure, then |
|
nasko
2015/05/22 16:32:28
nit: Drop one of the usages of "structure. It seem
lazyboy
2015/05/26 16:32:55
Done.
|
| + // this contain information about the structure. |
|
nasko
2015/05/22 16:32:27
nit: s/contain/contains/
lazyboy
2015/05/26 16:32:55
Done.
|
| + WebContentsTreeNode node_; |
| + |
| // SavePackage, lazily created. |
| scoped_refptr<SavePackage> save_package_; |