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

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

Issue 444813002: Remove BrowserPlugin's -internal-attach method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't crash on tear down 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_manager.h
diff --git a/content/renderer/browser_plugin/browser_plugin_manager.h b/content/renderer/browser_plugin/browser_plugin_manager.h
index 636f6ad2d978923a5e5cf4b253174e1838205263..bb9962cf37507af52bced34f80aa7d1a720c0d25 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager.h
+++ b/content/renderer/browser_plugin/browser_plugin_manager.h
@@ -12,8 +12,13 @@
#include "content/public/renderer/render_view_observer.h"
#include "ipc/ipc_sender.h"
+namespace base {
+class DictionaryValue;
+}
+
namespace blink {
class WebFrame;
+class WebNode;
struct WebPluginParams;
}
@@ -49,12 +54,17 @@ class CONTENT_EXPORT BrowserPluginManager
blink::WebFrame* frame,
bool auto_navigate) = 0;
- void AddBrowserPlugin(int guest_instance_id, BrowserPlugin* browser_plugin);
- void RemoveBrowserPlugin(int guest_instance_id);
- BrowserPlugin* GetBrowserPlugin(int guest_instance_id) const;
+ void Attach(int browser_plugin_instance_id);
+
+ void AddBrowserPlugin(int browser_plugin_instance_id,
+ BrowserPlugin* browser_plugin);
+ void RemoveBrowserPlugin(int browser_plugin_instance_id);
+ BrowserPlugin* GetBrowserPlugin(int browser_plugin_instance_id) const;
+
void UpdateDeviceScaleFactor(float device_scale_factor);
void UpdateFocusState();
RenderViewImpl* render_view() const { return render_view_.get(); }
+ int GetNextInstanceID();
// RenderViewObserver implementation.
@@ -77,6 +87,7 @@ class CONTENT_EXPORT BrowserPluginManager
virtual ~BrowserPluginManager();
// This map is keyed by guest instance IDs.
IDMap<BrowserPlugin> instances_;
+ int current_instance_id_;
base::WeakPtr<RenderViewImpl> render_view_;
DISALLOW_COPY_AND_ASSIGN(BrowserPluginManager);

Powered by Google App Engine
This is Rietveld 408576698