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

Side by Side Diff: webkit/support/webkit_support_glue.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 #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
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);
34 plugins->erase(plugins->begin() + i); 33 plugins->erase(plugins->begin() + i);
35 } 34 }
36 } 35 }
37 } 36 }
38 } 37 }
39 38
40 void AppendToLog(const char*, int, const char*) { 39 void AppendToLog(const char*, int, const char*) {
41 } 40 }
42 41
43 bool IsProtocolSupportedForMedia(const GURL& url) { 42 bool IsProtocolSupportedForMedia(const GURL& url) {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 return -1; 98 return -1;
100 } 99 }
101 100
102 bool GetFontTable(int fd, uint32_t table, uint8_t* output, 101 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
103 size_t* output_length) { 102 size_t* output_length) {
104 return false; 103 return false;
105 } 104 }
106 #endif 105 #endif
107 106
108 } // namespace webkit_glue 107 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698