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

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

Issue 272: Rollback the rollback of r1806. Wasn't the cause of the test failure. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 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 | « no previous file | webkit/glue/webframeloaderclient_impl.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 // TODO: Need mechanism to cleanup the static instance 5 // TODO: Need mechanism to cleanup the static instance
6 6
7 #ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__ 7 #ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__
8 #define WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__ 8 #define WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__
9 9
10 #include <string> 10 #include <string>
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 // Hardcoded logic to detect and load quicktime plugins 145 // Hardcoded logic to detect and load quicktime plugins
146 void LoadQuicktimePlugins(); 146 void LoadQuicktimePlugins();
147 147
148 // Hardcoded logic to detect and load Windows Media Player plugins 148 // Hardcoded logic to detect and load Windows Media Player plugins
149 void LoadWindowsMediaPlugins(); 149 void LoadWindowsMediaPlugins();
150 150
151 // Hardcoded logic to detect and load Java plugins 151 // Hardcoded logic to detect and load Java plugins
152 void LoadJavaPlugin(); 152 void LoadJavaPlugin();
153 153
154 #if defined(OS_WIN)
154 // Search the registry at the given path and load plugins listed there. 155 // Search the registry at the given path and load plugins listed there.
155 void LoadPluginsInRegistryFolder(HKEY root_key, 156 void LoadPluginsInRegistryFolder(HKEY root_key,
156 const std::wstring& registry_folder); 157 const std::wstring& registry_folder);
158 #endif
157 159
158 // true if we shouldn't load the new WMP plugin. 160 // true if we shouldn't load the new WMP plugin.
159 bool dont_load_new_wmp_; 161 bool dont_load_new_wmp_;
160 162
161 bool use_internal_activex_shim_; 163 bool use_internal_activex_shim_;
162 164
163 static scoped_refptr<PluginList> singleton_; 165 static scoped_refptr<PluginList> singleton_;
164 bool plugins_loaded_; 166 bool plugins_loaded_;
165 std::vector<scoped_refptr<PluginLib> > plugins_; 167 std::vector<scoped_refptr<PluginLib> > plugins_;
166 168
167 DISALLOW_EVIL_CONSTRUCTORS(PluginList); 169 DISALLOW_EVIL_CONSTRUCTORS(PluginList);
168 }; 170 };
169 171
170 } // namespace NPAPI 172 } // namespace NPAPI
171 173
172 #endif // WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__ 174 #endif // WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__
173 175
OLDNEW
« no previous file with comments | « no previous file | webkit/glue/webframeloaderclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698