OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/glue/webkit_glue.h" | 5 #include "webkit/glue/webkit_glue.h" |
6 | 6 |
7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "googleurl/src/gurl.h" | 9 #include "googleurl/src/gurl.h" |
10 #include "webkit/glue/user_agent.h" | 10 #include "webkit/glue/user_agent.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 // use the upstream version TestNetscapePlugIn. | 23 // use the upstream version TestNetscapePlugIn. |
24 const FilePath::StringType kPluginBlackList[] = { | 24 const FilePath::StringType kPluginBlackList[] = { |
25 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), | 25 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), |
26 FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"), | 26 FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"), |
27 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), | 27 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), |
28 }; | 28 }; |
29 for (int i = plugins->size() - 1; i >= 0; --i) { | 29 for (int i = plugins->size() - 1; i >= 0; --i) { |
30 webkit::WebPluginInfo plugin_info = plugins->at(i); | 30 webkit::WebPluginInfo plugin_info = plugins->at(i); |
31 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { | 31 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { |
32 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { | 32 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { |
| 33 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); |
33 plugins->erase(plugins->begin() + i); | 34 plugins->erase(plugins->begin() + i); |
34 } | 35 } |
35 } | 36 } |
36 } | 37 } |
37 } | 38 } |
38 | 39 |
39 void AppendToLog(const char*, int, const char*) { | 40 void AppendToLog(const char*, int, const char*) { |
40 } | 41 } |
41 | 42 |
42 bool IsProtocolSupportedForMedia(const GURL& url) { | 43 bool IsProtocolSupportedForMedia(const GURL& url) { |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 return -1; | 84 return -1; |
84 } | 85 } |
85 | 86 |
86 bool GetFontTable(int fd, uint32_t table, uint8_t* output, | 87 bool GetFontTable(int fd, uint32_t table, uint8_t* output, |
87 size_t* output_length) { | 88 size_t* output_length) { |
88 return false; | 89 return false; |
89 } | 90 } |
90 #endif | 91 #endif |
91 | 92 |
92 } // namespace webkit_glue | 93 } // namespace webkit_glue |
OLD | NEW |