diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebCore/plugins/PluginDatabase.cpp | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebCore/plugins/PluginDatabase.cpp')
| -rw-r--r-- | Source/WebCore/plugins/PluginDatabase.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebCore/plugins/PluginDatabase.cpp b/Source/WebCore/plugins/PluginDatabase.cpp index e021bad0e..961c45485 100644 --- a/Source/WebCore/plugins/PluginDatabase.cpp +++ b/Source/WebCore/plugins/PluginDatabase.cpp @@ -36,6 +36,10 @@ #include <stdlib.h> #include <wtf/text/CString.h> +#if PLATFORM(BLACKBERRY) +#include <BlackBerryPlatformSettings.h> +#endif + namespace WebCore { typedef HashMap<String, RefPtr<PluginPackage> > PluginPackageByNameMap; @@ -429,7 +433,7 @@ bool PluginDatabase::isPreferredPluginDirectory(const String& path) String preferredPath = homeDirectoryPath(); #if PLATFORM(BLACKBERRY) - preferredPath = BlackBerry::Platform::Client::get()->getApplicationPluginDirectory().c_str(); + preferredPath = BlackBerry::Platform::Settings::instance()->applicationPluginDirectory().c_str(); #elif defined(XP_UNIX) preferredPath.append(String("/.mozilla/plugins")); #elif defined(XP_MACOSX) |