diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/plugins/PluginInfoStore.cpp | |
| parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
| download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 | |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
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 } } |