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

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

Issue 8071013: Finish moving plugin probing out of process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 2 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/plugins/npapi/plugin_lib_mac.mm ('k') | 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) 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 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 // If |use_stale| is NULL, this will load the plug-in list if necessary. 141 // If |use_stale| is NULL, this will load the plug-in list if necessary.
142 // If it is not NULL, the plug-in list will not be loaded, and |*use_stale| 142 // If it is not NULL, the plug-in list will not be loaded, and |*use_stale|
143 // will be true iff the plug-in list was stale. 143 // will be true iff the plug-in list was stale.
144 void GetPluginInfoArray(const GURL& url, 144 void GetPluginInfoArray(const GURL& url,
145 const std::string& mime_type, 145 const std::string& mime_type,
146 bool allow_wildcard, 146 bool allow_wildcard,
147 bool* use_stale, 147 bool* use_stale,
148 std::vector<webkit::WebPluginInfo>* info, 148 std::vector<webkit::WebPluginInfo>* info,
149 std::vector<std::string>* actual_mime_types); 149 std::vector<std::string>* actual_mime_types);
150 150
151 // Get plugin info by plugin path (including disabled plugins). Returns true
152 // if the plugin is found and WebPluginInfo has been filled in |info|.
153 bool GetPluginInfoByPath(const FilePath& plugin_path,
154 webkit::WebPluginInfo* info);
155
156 // Populates the given vector with all available plugin groups. If 151 // Populates the given vector with all available plugin groups. If
157 // |load_if_necessary| is true, this will potentially load the plugin list 152 // |load_if_necessary| is true, this will potentially load the plugin list
158 // synchronously. 153 // synchronously.
159 void GetPluginGroups(bool load_if_necessary, 154 void GetPluginGroups(bool load_if_necessary,
160 std::vector<PluginGroup>* plugin_groups); 155 std::vector<PluginGroup>* plugin_groups);
161 156
162 // Returns a copy of the PluginGroup corresponding to the given WebPluginInfo. 157 // Returns a copy of the PluginGroup corresponding to the given WebPluginInfo.
163 // The caller takes ownership of the returned PluginGroup. 158 // The caller takes ownership of the returned PluginGroup.
164 PluginGroup* GetPluginGroup(const webkit::WebPluginInfo& web_plugin_info); 159 PluginGroup* GetPluginGroup(const webkit::WebPluginInfo& web_plugin_info);
165 160
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 // Set to true if the default plugin is enabled. 306 // Set to true if the default plugin is enabled.
312 bool default_plugin_enabled_; 307 bool default_plugin_enabled_;
313 308
314 DISALLOW_COPY_AND_ASSIGN(PluginList); 309 DISALLOW_COPY_AND_ASSIGN(PluginList);
315 }; 310 };
316 311
317 } // namespace npapi 312 } // namespace npapi
318 } // namespace webkit 313 } // namespace webkit
319 314
320 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_ 315 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/plugin_lib_mac.mm ('k') | webkit/plugins/npapi/plugin_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698