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

Side by Side Diff: webkit/tools/test_shell/test_shell.cc

Issue 7848025: Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indent Created 9 years, 3 months 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) 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 #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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 // the copy in webkit.org's repository instead. 692 // the copy in webkit.org's repository instead.
693 const FilePath::StringType kPluginBlackList[] = { 693 const FilePath::StringType kPluginBlackList[] = {
694 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), 694 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"),
695 FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"), 695 FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"),
696 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), 696 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"),
697 }; 697 };
698 for (int i = plugins->size() - 1; i >= 0; --i) { 698 for (int i = plugins->size() - 1; i >= 0; --i) {
699 webkit::WebPluginInfo plugin_info = plugins->at(i); 699 webkit::WebPluginInfo plugin_info = plugins->at(i);
700 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { 700 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
701 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { 701 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
702 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path);
703 plugins->erase(plugins->begin() + i); 702 plugins->erase(plugins->begin() + i);
704 } 703 }
705 } 704 }
706 } 705 }
707 } 706 }
708 707
709 } // namespace webkit_glue 708 } // namespace webkit_glue
OLDNEW
« webkit/plugins/npapi/plugin_group.cc ('K') | « webkit/support/webkit_support_glue.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698