| Index: content/browser/renderer_host/render_view_host_impl.h
|
| diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
|
| index 9f1972d56b86c96f8e152fdd04cc3e839f1de79c..81e3803478772ec5ae8703fa828fe4f137ffc403 100644
|
| --- a/content/browser/renderer_host/render_view_host_impl.h
|
| +++ b/content/browser/renderer_host/render_view_host_impl.h
|
| @@ -20,6 +20,7 @@
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/common/window_container_type.h"
|
| #include "net/base/load_states.h"
|
| +#include "ppapi/c/pp_instance.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
|
| @@ -230,13 +231,19 @@ class CONTENT_EXPORT RenderViewHostImpl
|
|
|
| // Set up the RenderView child process. Virtual because it is overridden by
|
| // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used
|
| - // as the name of the new top-level frame. The |opener_route_id| parameter
|
| + // as the name of the new top-level frame. If |max_page_id| is larger than
|
| + // -1, the RenderView is told to start issuing page IDs at |max_page_id| + 1.
|
| + // If this RenderView is a guest, the embedder's process id is also passed in
|
| + // so that the RenderView's process can establish a channel with its embedder
|
| + // if it's not already established.
|
| + // The |opener_route_id| parameter
|
| // indicates which RenderView created this (MSG_ROUTING_NONE if none). If
|
| // |max_page_id| is larger than -1, the RenderView is told to start issuing
|
| // page IDs at |max_page_id| + 1.
|
| virtual bool CreateRenderView(const string16& frame_name,
|
| int opener_route_id,
|
| - int32 max_page_id);
|
| + int32 max_page_id,
|
| + int embedder_process_id);
|
|
|
| base::TerminationStatus render_view_termination_status() const {
|
| return render_view_termination_status_;
|
| @@ -350,8 +357,6 @@ class CONTENT_EXPORT RenderViewHostImpl
|
| sudden_termination_allowed_ = enabled;
|
| }
|
|
|
| - void set_guest(bool guest) { guest_ = guest; }
|
| -
|
| // RenderWidgetHost public overrides.
|
| virtual void Shutdown() OVERRIDE;
|
| virtual bool IsRenderView() const OVERRIDE;
|
| @@ -560,9 +565,6 @@ class CONTENT_EXPORT RenderViewHostImpl
|
| // See BindingsPolicy for details.
|
| int enabled_bindings_;
|
|
|
| - // Indicates whether or not this RenderViewHost refers to a guest RenderView.
|
| - bool guest_;
|
| -
|
| // The request_id for the pending cross-site request. Set to -1 if
|
| // there is a pending request, but we have not yet started the unload
|
| // for the current page. Set to the request_id value of the pending
|
|
|