Index: chrome/renderer/plugins/chrome_plugin_placeholder.h |
diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.h b/chrome/renderer/plugins/chrome_plugin_placeholder.h |
index 0e8b1e38768aba3f0cb0c84d8e796a3ff07eb967..64f64507f493742635e449fe8d5cb9a726b6c2da 100644 |
--- a/chrome/renderer/plugins/chrome_plugin_placeholder.h |
+++ b/chrome/renderer/plugins/chrome_plugin_placeholder.h |
@@ -49,9 +49,6 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder, |
const string16& title); |
virtual ~ChromePluginPlaceholder(); |
- // WebViewPlugin::Delegate (via PluginPlaceholder) method |
- virtual void BindWebFrame(blink::WebFrame* frame) OVERRIDE; |
- |
// content::RenderViewObserver (via PluginPlaceholder) override: |
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
@@ -66,9 +63,7 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder, |
virtual void OnMenuClosed(int request_id) OVERRIDE; |
// Javascript callback opens chrome://plugins in a new tab. |
- // Arguments are required by the caller, but not used. |
- void OpenAboutPluginsCallback(const webkit_glue::CppArgumentList& args, |
- webkit_glue::CppVariant* result); |
+ void OpenAboutPluginsCallback(); |
void OnLoadBlockedPlugins(const std::string& identifier); |
void OnSetIsPrerendering(bool is_prerendering); |
@@ -97,6 +92,8 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder, |
int context_menu_request_id_; // Nonzero when request pending. |
string16 plugin_name_; |
+ base::WeakPtrFactory<ChromePluginPlaceholder> weak_factory_; |
+ |
DISALLOW_COPY_AND_ASSIGN(ChromePluginPlaceholder); |
}; |