| 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..b62b9aabadc9d7b0db3e9e1b14a1015c5e52e70b 100644
|
| --- a/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| @@ -49,8 +49,8 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
| const string16& title);
|
| virtual ~ChromePluginPlaceholder();
|
|
|
| - // WebViewPlugin::Delegate (via PluginPlaceholder) method
|
| - virtual void BindWebFrame(blink::WebFrame* frame) OVERRIDE;
|
| + // PluginPlaceholder method
|
| + virtual void Observe(const std::string& callback) OVERRIDE;
|
|
|
| // content::RenderViewObserver (via PluginPlaceholder) override:
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
| @@ -65,11 +65,6 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
| virtual void OnMenuAction(int request_id, unsigned action) OVERRIDE;
|
| 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 OnLoadBlockedPlugins(const std::string& identifier);
|
| void OnSetIsPrerendering(bool is_prerendering);
|
| #if defined(ENABLE_PLUGIN_INSTALLATION)
|
|
|