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

Side by Side Diff: content/common/pepper_plugin_registry.h

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
Property Changes:
Added: svn:mergeinfo
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 #ifndef CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_ 5 #ifndef CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_
6 #define CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_ 6 #define CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_
7 #pragma once 7 #pragma once
8 8
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 15 matching lines...) Expand all
26 26
27 // Indicates internal plugins for which there's not actually a library. 27 // Indicates internal plugins for which there's not actually a library.
28 // These plugins are implemented in the Chrome binary using a separate set 28 // These plugins are implemented in the Chrome binary using a separate set
29 // of entry points (see internal_entry_points below). 29 // of entry points (see internal_entry_points below).
30 // Defaults to false. 30 // Defaults to false.
31 bool is_internal; 31 bool is_internal;
32 32
33 // True when this plugin should be run out of process. Defaults to false. 33 // True when this plugin should be run out of process. Defaults to false.
34 bool is_out_of_process; 34 bool is_out_of_process;
35 35
36 // Whether the plugin is enabled. Defaults to true.
37 bool enabled;
38
36 FilePath path; // Internal plugins have "internal-[name]" as path. 39 FilePath path; // Internal plugins have "internal-[name]" as path.
37 std::string name; 40 std::string name;
38 std::string description; 41 std::string description;
39 std::string version; 42 std::string version;
40 std::vector<webkit::WebPluginMimeType> mime_types; 43 std::vector<webkit::WebPluginMimeType> mime_types;
41 44
42 // When is_internal is set, this contains the function pointers to the 45 // When is_internal is set, this contains the function pointers to the
43 // entry points for the internal plugins. 46 // entry points for the internal plugins.
44 webkit::ppapi::PluginModule::EntryPoints internal_entry_points; 47 webkit::ppapi::PluginModule::EntryPoints internal_entry_points;
45 }; 48 };
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 // non-crashed modules. If an out-of-process module crashes, it may 124 // non-crashed modules. If an out-of-process module crashes, it may
122 // continue as long as there are WebKit references to it, but it will not 125 // continue as long as there are WebKit references to it, but it will not
123 // appear in this list. 126 // appear in this list.
124 typedef std::map<FilePath, webkit::ppapi::PluginModule*> NonOwningModuleMap; 127 typedef std::map<FilePath, webkit::ppapi::PluginModule*> NonOwningModuleMap;
125 NonOwningModuleMap live_modules_; 128 NonOwningModuleMap live_modules_;
126 129
127 DISALLOW_COPY_AND_ASSIGN(PepperPluginRegistry); 130 DISALLOW_COPY_AND_ASSIGN(PepperPluginRegistry);
128 }; 131 };
129 132
130 #endif // CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_ 133 #endif // CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | content/common/pepper_plugin_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698