Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2336)

Unified Diff: webkit/support/webkit_support_glue.cc

Issue 8602002: Move some webkit_glue embedder functions into WebKitPlatformSupport virtual methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyright year Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/support/webkit_support_glue.cc
diff --git a/webkit/support/webkit_support_glue.cc b/webkit/support/webkit_support_glue.cc
index a1e64fdf797d124c0210c82a46d5156690c66c24..dad0b6091b1dd2fd1df9e3ec1bc70c98d67d1bc6 100644
--- a/webkit/support/webkit_support_glue.cc
+++ b/webkit/support/webkit_support_glue.cc
@@ -7,34 +7,11 @@
#include "base/base_paths.h"
#include "base/path_service.h"
#include "webkit/glue/user_agent.h"
-#include "webkit/plugins/npapi/plugin_list.h"
// Functions needed by webkit_glue.
namespace webkit_glue {
-void GetPlugins(bool refresh,
- std::vector<webkit::WebPluginInfo>* plugins) {
- if (refresh)
- webkit::npapi::PluginList::Singleton()->RefreshPlugins();
- webkit::npapi::PluginList::Singleton()->GetPlugins(plugins);
- // Don't load the forked npapi_layout_test_plugin in DRT, we only want to
- // use the upstream version TestNetscapePlugIn.
- const FilePath::StringType kPluginBlackList[] = {
- FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"),
- FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"),
- FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"),
- };
- for (int i = plugins->size() - 1; i >= 0; --i) {
- webkit::WebPluginInfo plugin_info = plugins->at(i);
- for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
- if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
- plugins->erase(plugins->begin() + i);
- }
- }
- }
-}
-
void AppendToLog(const char*, int, const char*) {
}
« no previous file with comments | « webkit/support/test_webkit_platform_support.cc ('k') | webkit/tools/test_shell/simple_resource_loader_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698