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 86e987fece752fcd7574d5407fff6dc17298f7b0..d7bac9a65b086ccabd99580ce53bca583e5a5af7 100644 |
| --- a/content/browser/web_contents/web_contents_impl.h |
| +++ b/content/browser/web_contents/web_contents_impl.h |
| @@ -218,6 +218,9 @@ class CONTENT_EXPORT WebContentsImpl |
| void ClearNavigationTransitionData(); |
| // WebContents ------------------------------------------------------ |
| + int AttachLocalFrameToGuest(WebContents* embedder_web_contents, |
|
Charlie Reis
2015/04/30 23:06:47
Move lower, as mentioned in web_contents.h.
lazyboy
2015/05/05 07:28:14
Done.
|
| + int embedder_frame_process_id, |
| + int embedder_frame_routing_id) override; |
| WebContentsDelegate* GetDelegate() override; |
| void SetDelegate(WebContentsDelegate* delegate) override; |
| NavigationControllerImpl& GetController() override; |
| @@ -597,6 +600,7 @@ class CONTENT_EXPORT WebContentsImpl |
| bool FocusLocationBarByDefault() override; |
| void SetFocusToLocationBar(bool select_all) override; |
| bool IsHidden() override; |
| + int64 GetEmbedderFrameTreeNodeID() override; |
| // NotificationObserver ------------------------------------------------------ |
| @@ -732,6 +736,23 @@ class CONTENT_EXPORT WebContentsImpl |
| class DestructionObserver; |
| + // Used to create tree of WebContents. |
|
Charlie Reis
2015/04/30 23:06:47
Please clarify what this is used for, since it's n
lazyboy
2015/05/05 07:28:15
Done.
|
| + class WebContentsNode { |
|
Charlie Reis
2015/04/30 23:06:47
Perhaps this should just be a struct?
WebContents
lazyboy
2015/05/05 07:28:15
Done.
|
| + public: |
| + WebContentsNode(); |
| + ~WebContentsNode(); |
| + |
| + void set_parent_web_contents(WebContentsImpl* parent_web_contents) { |
| + 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); |
| @@ -1259,6 +1280,8 @@ class CONTENT_EXPORT WebContentsImpl |
| bool virtual_keyboard_requested_; |
| + WebContentsNode node_; |
|
Charlie Reis
2015/04/30 23:06:47
This needs a comment and should probably be up hig
lazyboy
2015/05/05 07:28:15
Done.
|
| + |
| #if defined(ENABLE_BROWSER_CDMS) |
| // Manages all the media player and CDM managers and forwards IPCs to them. |
| scoped_ptr<MediaWebContentsObserver> media_web_contents_observer_; |