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

Side by Side Diff: webkit/plugins/npapi/plugin_list.h

Issue 11419234: Merge 167979 - Remove PluginList::RemovePlugin() and directly remove old plug-ins from plug-in list… (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/
Patch Set: Created 8 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
« no previous file with comments | « no previous file | webkit/plugins/npapi/plugin_list.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_ 5 #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
6 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_ 6 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 bool allow_wildcard); 276 bool allow_wildcard);
277 277
278 // Returns true if the given plugin supports a given file extension. 278 // Returns true if the given plugin supports a given file extension.
279 // |extension| should be all lower case. If |mime_type| is not NULL, it will 279 // |extension| should be all lower case. If |mime_type| is not NULL, it will
280 // be set to the MIME type if found. The MIME type which corresponds to the 280 // be set to the MIME type if found. The MIME type which corresponds to the
281 // extension is optionally returned back. 281 // extension is optionally returned back.
282 bool SupportsExtension(const webkit::WebPluginInfo& plugin, 282 bool SupportsExtension(const webkit::WebPluginInfo& plugin,
283 const std::string& extension, 283 const std::string& extension,
284 std::string* actual_mime_type); 284 std::string* actual_mime_type);
285 285
286 // Removes a plug-in from |plugins_list_| by its path.
287 static bool RemovePlugin(const FilePath& filename,
288 std::vector<webkit::WebPluginInfo>* plugins);
289
290 // 286 //
291 // Platform functions 287 // Platform functions
292 // 288 //
293 289
294 // Do any initialization. 290 // Do any initialization.
295 void PlatformInit(); 291 void PlatformInit();
296 292
297 // 293 //
298 // Command-line switches 294 // Command-line switches
299 // 295 //
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 // accessed on multiple threads. 339 // accessed on multiple threads.
344 base::Lock lock_; 340 base::Lock lock_;
345 341
346 DISALLOW_COPY_AND_ASSIGN(PluginList); 342 DISALLOW_COPY_AND_ASSIGN(PluginList);
347 }; 343 };
348 344
349 } // namespace npapi 345 } // namespace npapi
350 } // namespace webkit 346 } // namespace webkit
351 347
352 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_ 348 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
OLDNEW
« no previous file with comments | « no previous file | webkit/plugins/npapi/plugin_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698