diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:28 -0800 |
| commit | 4dd98cc27e25e6c3104672f50749132d2236461b (patch) | |
| tree | 01f4412526c81ec62e02d71d128ec45827a12fdc /WebCore/plugins/PluginInfoStore.cpp | |
| parent | fadf964da75468c2c995316cea8d82d32705a7e1 (diff) | |
| parent | aad6f24e036b3740071bb995b955b18b572067b2 (diff) | |
| download | external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.zip external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.tar.gz external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.tar.bz2 | |
am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit 'aad6f24e036b3740071bb995b955b18b572067b2' into eclair-mr2-plus-aosp
* commit 'aad6f24e036b3740071bb995b955b18b572067b2':
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 } } |