diff options
Diffstat (limited to 'WebCore/plugins/PluginInfoStore.cpp')
| -rw-r--r-- | WebCore/plugins/PluginInfoStore.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/WebCore/plugins/PluginInfoStore.cpp b/WebCore/plugins/PluginInfoStore.cpp index bd2f2d0..9a441f3 100644 --- a/WebCore/plugins/PluginInfoStore.cpp +++ b/WebCore/plugins/PluginInfoStore.cpp @@ -27,9 +27,15 @@ #include "PluginInfoStore.h" #include "KURL.h" +<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp #if PLATFORM(ANDROID) +======= +>>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp #include "Page.h" +<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp #endif +======= +>>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp #include "PluginData.h" #include "PluginDatabase.h" #include "PluginPackage.h" @@ -96,8 +102,12 @@ bool PluginInfoStore::supportsMIMEType(const WebCore::String& mimeType) void refreshPlugins(bool reloadOpenPages) { +<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp #if PLATFORM(ANDROID) +======= +>>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp Page::refreshPlugins(reloadOpenPages); +<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp #else PluginDatabase::installedPlugins()->refresh(); @@ -105,6 +115,8 @@ void refreshPlugins(bool reloadOpenPages) // FIXME: reload open pages } #endif +======= +>>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp } } |