| Index: content/renderer/browser_plugin/browser_plugin_impl.h
|
| diff --git a/content/renderer/browser_plugin/browser_plugin_impl.h b/content/renderer/browser_plugin/browser_plugin_impl.h
|
| index a0973445bc987a122c9aff0615ecf6a527f390ac..d87460a43d624c03a41da11a4f9c6cb74d4191c2 100644
|
| --- a/content/renderer/browser_plugin/browser_plugin_impl.h
|
| +++ b/content/renderer/browser_plugin/browser_plugin_impl.h
|
| @@ -37,9 +37,6 @@ class CONTENT_EXPORT BrowserPluginImpl :
|
| NON_EXPORTED_BASE(public WebKit::WebPlugin),
|
| public BrowserPlugin {
|
| public:
|
| - RenderViewImpl* render_view() const { return render_view_.get(); }
|
| - int render_view_routing_id() const { return render_view_routing_id_; }
|
| -
|
| bool OnMessageReceived(const IPC::Message& msg);
|
|
|
| // Get the name attribute value.
|
| @@ -94,16 +91,6 @@ class CONTENT_EXPORT BrowserPluginImpl :
|
| void UpdateGuestFocusState();
|
| // Indicates whether the guest should be focused.
|
| bool ShouldGuestBeFocused() const;
|
| -
|
| - // Tells the BrowserPlugin to tell the guest to navigate to the previous
|
| - // navigation entry in the navigation history.
|
| - void Back();
|
| - // Tells the BrowserPlugin to tell the guest to navigate to the next
|
| - // navigation entry in the navigation history.
|
| - void Forward();
|
| - // Tells the BrowserPlugin to tell the guest to navigate to a position
|
| - // relative to the current index in its navigation history.
|
| - void Go(int relativeIndex);
|
| // Tells the BrowserPlugin to terminate the guest process.
|
| void TerminateGuest();
|
|
|
| @@ -132,12 +119,13 @@ class CONTENT_EXPORT BrowserPluginImpl :
|
|
|
|
|
| // BrowserPlugin implementation.
|
| - virtual RenderView* GetRenderView() const OVERRIDE;
|
| - virtual WebKit::WebPluginContainer* GetContainer() const OVERRIDE;
|
| virtual void AddMethodBinding(
|
| BrowserPluginMethodBinding* method_binding) OVERRIDE;
|
| virtual void AddPropertyBinding(
|
| BrowserPluginPropertyBinding* method_binding) OVERRIDE;
|
| + virtual RenderView* GetRenderView() const OVERRIDE;
|
| + virtual int GetRoutingID() const OVERRIDE;
|
| + virtual WebKit::WebPluginContainer* GetContainer() const OVERRIDE;
|
| virtual void TriggerEvent(
|
| const std::string& event_name,
|
| std::map<std::string, base::Value*>* props) OVERRIDE;
|
| @@ -148,7 +136,7 @@ class CONTENT_EXPORT BrowserPluginImpl :
|
| const std::string& attribute_name) const OVERRIDE;
|
| virtual bool HasDOMAttribute(
|
| const std::string& attribute_name) const OVERRIDE;
|
| - virtual bool HasNavigated() const OVERRIDE;
|
| + virtual bool HasGuest() const OVERRIDE;
|
|
|
| // IPC::Sender implementation.
|
| virtual bool Send(IPC::Message* message) OVERRIDE;
|
| @@ -362,7 +350,7 @@ class CONTENT_EXPORT BrowserPluginImpl :
|
| bool guest_crashed_;
|
| scoped_ptr<BrowserPluginHostMsg_ResizeGuest_Params> pending_resize_params_;
|
| // True if we have ever sent a NavigateGuest message to the embedder.
|
| - bool navigate_src_sent_;
|
| + bool guest_allocated_;
|
| bool auto_size_ack_pending_;
|
| int guest_process_id_;
|
| int guest_route_id_;
|
|
|