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

Side by Side Diff: webkit/tools/test_shell/test_shell.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 #undef LOG 5 #undef LOG
6 6
7 #include "webkit/tools/test_shell/test_shell.h" 7 #include "webkit/tools/test_shell/test_shell.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 // the copy in webkit.org's repository instead. 908 // the copy in webkit.org's repository instead.
909 const FilePath::StringType kPluginBlackList[] = { 909 const FilePath::StringType kPluginBlackList[] = {
910 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), 910 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"),
911 FILE_PATH_LITERAL("TestNetscapePlugIn.plugin"), 911 FILE_PATH_LITERAL("TestNetscapePlugIn.plugin"),
912 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), 912 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"),
913 }; 913 };
914 for (int i = plugins->size() - 1; i >= 0; --i) { 914 for (int i = plugins->size() - 1; i >= 0; --i) {
915 webkit::npapi::WebPluginInfo plugin_info = plugins->at(i); 915 webkit::npapi::WebPluginInfo plugin_info = plugins->at(i);
916 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { 916 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
917 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { 917 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
918 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); 918 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path,
919 plugin_info.name);
919 plugins->erase(plugins->begin() + i); 920 plugins->erase(plugins->begin() + i);
920 } 921 }
921 } 922 }
922 } 923 }
923 } 924 }
924 925
925 } // namespace webkit_glue 926 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698