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

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

Issue 7901015: Revert 101269 - Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo, to ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « webkit/support/webkit_support_glue.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/tools/test_shell/test_shell.cc:r3734-4217,4606-5108,5177-5263
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 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 // the copy in webkit.org's repository instead. 668 // the copy in webkit.org's repository instead.
669 const FilePath::StringType kPluginBlackList[] = { 669 const FilePath::StringType kPluginBlackList[] = {
670 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), 670 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"),
671 FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"), 671 FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"),
672 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), 672 FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"),
673 }; 673 };
674 for (int i = plugins->size() - 1; i >= 0; --i) { 674 for (int i = plugins->size() - 1; i >= 0; --i) {
675 webkit::WebPluginInfo plugin_info = plugins->at(i); 675 webkit::WebPluginInfo plugin_info = plugins->at(i);
676 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { 676 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
677 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { 677 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
678 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path);
678 plugins->erase(plugins->begin() + i); 679 plugins->erase(plugins->begin() + i);
679 } 680 }
680 } 681 }
681 } 682 }
682 } 683 }
683 684
684 } // namespace webkit_glue 685 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/support/webkit_support_glue.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698