Index: content/renderer/browser_plugin/browser_plugin.h |
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h |
index 0948e1c8936870dc88a73ce6e7fbade71f7b2c2d..fc0a4bf87e560bb258027d69f314e23d32ef1f2e 100644 |
--- a/content/renderer/browser_plugin/browser_plugin.h |
+++ b/content/renderer/browser_plugin/browser_plugin.h |
@@ -23,6 +23,7 @@ struct FrameMsg_BuffersSwapped_Params; |
namespace content { |
+class BrowserPluginDelegate; |
class ChildFrameCompositingHelper; |
class BrowserPluginManager; |
class MockBrowserPlugin; |
@@ -163,9 +164,10 @@ class CONTENT_EXPORT BrowserPlugin : |
// acquires a browser_plugin_instance_id as well. The guest instance ID |
// uniquely identifies a guest WebContents that's hosted by this |
// BrowserPlugin. |
+ // Takes ownership of |delegate| if there's one. |
Ken Rockot(use gerrit already)
2014/09/04 00:57:43
Could you just make the argument a scoped_ptr so t
lazyboy
2014/09/04 18:59:33
Done.
|
BrowserPlugin(RenderViewImpl* render_view, |
blink::WebFrame* frame, |
- bool auto_navigate); |
+ BrowserPluginDelegate* delegate); |
virtual ~BrowserPlugin(); |
@@ -234,9 +236,6 @@ class CONTENT_EXPORT BrowserPlugin : |
// embedder RenderView's visibility. |
bool visible_; |
- const bool auto_navigate_; |
- std::string html_string_; |
- |
WebCursor cursor_; |
gfx::Size last_view_size_; |
@@ -258,6 +257,8 @@ class CONTENT_EXPORT BrowserPlugin : |
std::vector<EditCommand> edit_commands_; |
+ scoped_ptr<BrowserPluginDelegate> delegate_; |
+ |
// Weak factory used in v8 |MakeWeak| callback, since the v8 callback might |
// get called after BrowserPlugin has been destroyed. |
base::WeakPtrFactory<BrowserPlugin> weak_ptr_factory_; |