diff options
Diffstat (limited to 'WebCore/plugins/PluginView.h')
-rw-r--r-- | WebCore/plugins/PluginView.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index 45bd867..5c39535 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -218,16 +218,13 @@ namespace WebCore { static bool isCallingPlugin(); -#ifdef MANUAL_MERGE_REQUIRED #ifdef ANDROID_PLUGINS Frame* getParentFrame() const { return m_parentFrame; } Element* getElement() const { return m_element; } #endif -#else // MANUAL_MERGE_REQUIRED bool start(); -#endif // MANUAL_MERGE_REQUIRED private: PluginView(Frame* parentFrame, const IntSize&, PluginPackage*, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually); |