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

Unified Diff: content/browser/web_contents/web_contents_impl.h

Issue 972313002: Make <webview> use out-of-process iframe architecture. (Closed) Base URL: ssh://saopaulo.wat/mnt/dev/shared/src@testoopif2z-better-chrome
Patch Set: some review comments addressed Created 5 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 side-by-side diff with in-line comments
Download patch
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 c4f908caa0ab8f497182e675f78b8041149cc7db..f7a5fdbe1c2acc8726c17bfb089cca91cca43502 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -25,6 +25,7 @@
#include "content/browser/media/audio_state_provider.h"
#include "content/browser/renderer_host/render_view_host_delegate.h"
#include "content/browser/renderer_host/render_widget_host_delegate.h"
+#include "content/browser/web_contents/web_contents_node.h"
#include "content/common/accessibility_mode_enums.h"
#include "content/common/content_export.h"
#include "content/public/browser/color_chooser.h"
@@ -124,6 +125,9 @@ class CONTENT_EXPORT WebContentsImpl
// members call back into our virtual functions in the constructor.
virtual void Init(const WebContents::CreateParams& params);
+ int AttachLocalFrameToGuest(WebContents* embedder_web_contents,
Charlie Reis 2015/04/08 23:42:11 This belongs with the WebContents overrides below.
lazyboy 2015/04/14 01:38:04 Done.
+ int embedder_frame_routing_id) override;
+
// Returns the SavePackage which manages the page saving job. May be NULL.
SavePackage* save_package() const { return save_package_.get(); }
@@ -590,6 +594,7 @@ class CONTENT_EXPORT WebContentsImpl
bool FocusLocationBarByDefault() override;
void SetFocusToLocationBar(bool select_all) override;
bool IsHidden() override;
+ int64 GetParentFrameTreeNodeID() override;
// NotificationObserver ------------------------------------------------------
@@ -1259,6 +1264,8 @@ class CONTENT_EXPORT WebContentsImpl
bool virtual_keyboard_requested_;
+ WebContentsNode node_;
+
#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_;

Powered by Google App Engine
This is Rietveld 408576698