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

Unified Diff: content/renderer/browser_plugin/browser_plugin.h

Issue 376033002: Adding MimeHandlerView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pending-zork-patch2
Patch Set: add (c) header Created 6 years, 4 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/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 357ff016e35becb9e047d97277a1e00a76483fe0..60b727adc43a1e97b613924dfb25679b6904aef3 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;
@@ -165,9 +166,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.
BrowserPlugin(RenderViewImpl* render_view,
blink::WebFrame* frame,
- bool auto_navigate);
+ BrowserPluginDelegate* delegate);
virtual ~BrowserPlugin();
@@ -236,9 +238,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_;
@@ -260,6 +259,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_;

Powered by Google App Engine
This is Rietveld 408576698