diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 10:01:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:01:16 -0800 |
| commit | 8f75286f8f97df46e2fb2411460a5efb3fc9b083 (patch) | |
| tree | eca591661d5d9fc0fc58e2d2a2d11dfc8c406ccc /WebCore/plugins/PluginInfoStore.cpp | |
| parent | e4b2e0b8a34bdde6f219c2d755af174569fa728f (diff) | |
| parent | 4dd98cc27e25e6c3104672f50749132d2236461b (diff) | |
| download | external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.zip external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.tar.gz external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.tar.bz2 | |
am 4dd98cc2: am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit '4dd98cc27e25e6c3104672f50749132d2236461b'
* commit '4dd98cc27e25e6c3104672f50749132d2236461b':
Merge webkit.org at r51976 : Fix general conflicts.
Diffstat (limited to 'WebCore/plugins/PluginInfoStore.cpp')
| -rw-r--r-- | WebCore/plugins/PluginInfoStore.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/WebCore/plugins/PluginInfoStore.cpp b/WebCore/plugins/PluginInfoStore.cpp index 9a441f3..88dc7ee 100644 --- a/WebCore/plugins/PluginInfoStore.cpp +++ b/WebCore/plugins/PluginInfoStore.cpp @@ -27,15 +27,7 @@ #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" @@ -102,21 +94,7 @@ 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(); - - if (reloadOpenPages) { - // FIXME: reload open pages - } -#endif -======= ->>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp } } |