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

Side by Side Diff: webkit/support/webkit_support_glue.cc

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up WebPluginInfo and rebased on fixed PluginGroup::InitFrom. Created 10 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/plugins/npapi/plugin_list.h" 10 #include "webkit/plugins/npapi/plugin_list.h"
(...skipping 10 matching lines...) Expand all
21 // is named WebKitTestNetscapePlugIn). 21 // is named WebKitTestNetscapePlugIn).
22 const FilePath::StringType kPluginBlackList[] = { 22 const FilePath::StringType kPluginBlackList[] = {
23 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), 23 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"),
24 FILE_PATH_LITERAL("TestNetscapePlugIn.plugin"), 24 FILE_PATH_LITERAL("TestNetscapePlugIn.plugin"),
25 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), 25 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"),
26 }; 26 };
27 for (int i = plugins->size() - 1; i >= 0; --i) { 27 for (int i = plugins->size() - 1; i >= 0; --i) {
28 webkit::npapi::WebPluginInfo plugin_info = plugins->at(i); 28 webkit::npapi::WebPluginInfo plugin_info = plugins->at(i);
29 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { 29 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
30 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { 30 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
31 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); 31 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path,
32 plugin_info.name);
32 plugins->erase(plugins->begin() + i); 33 plugins->erase(plugins->begin() + i);
33 } 34 }
34 } 35 }
35 } 36 }
36 } 37 }
37 38
38 bool IsDefaultPluginEnabled() { 39 bool IsDefaultPluginEnabled() {
39 return false; 40 return false;
40 } 41 }
41 42
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 return -1; 107 return -1;
107 } 108 }
108 109
109 bool GetFontTable(int fd, uint32_t table, uint8_t* output, 110 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
110 size_t* output_length) { 111 size_t* output_length) {
111 return false; 112 return false;
112 } 113 }
113 #endif 114 #endif
114 115
115 } // namespace webkit_glue 116 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698