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

Side by Side Diff: content/public/browser/plugin_service.h

Issue 11151006: Revert 161615 - Merge 161210 - Only register the newer one of {bundled, component} Pepper Flash. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/
Patch Set: Created 8 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 | « content/browser/plugin_service_impl.cc ('k') | no next file » | 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 CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_H_
6 #define CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_H_ 6 #define CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // accidentally load plugins in the wrong process or thread. Refer to 127 // accidentally load plugins in the wrong process or thread. Refer to
128 // PluginList for further documentation of these functions. 128 // PluginList for further documentation of these functions.
129 virtual void RefreshPlugins() = 0; 129 virtual void RefreshPlugins() = 0;
130 virtual void AddExtraPluginPath(const FilePath& path) = 0; 130 virtual void AddExtraPluginPath(const FilePath& path) = 0;
131 virtual void AddExtraPluginDir(const FilePath& path) = 0; 131 virtual void AddExtraPluginDir(const FilePath& path) = 0;
132 virtual void RemoveExtraPluginPath(const FilePath& path) = 0; 132 virtual void RemoveExtraPluginPath(const FilePath& path) = 0;
133 virtual void UnregisterInternalPlugin(const FilePath& path) = 0; 133 virtual void UnregisterInternalPlugin(const FilePath& path) = 0;
134 virtual void RegisterInternalPlugin(const webkit::WebPluginInfo& info, 134 virtual void RegisterInternalPlugin(const webkit::WebPluginInfo& info,
135 bool add_at_beginning) = 0; 135 bool add_at_beginning) = 0;
136 virtual string16 GetPluginGroupName(const std::string& plugin_name) = 0; 136 virtual string16 GetPluginGroupName(const std::string& plugin_name) = 0;
137 virtual void GetInternalPlugins(
138 std::vector<webkit::WebPluginInfo>* plugins) = 0;
139 137
140 // TODO(dpranke): This should be private. 138 // TODO(dpranke): This should be private.
141 virtual webkit::npapi::PluginList* GetPluginList() = 0; 139 virtual webkit::npapi::PluginList* GetPluginList() = 0;
142 140
143 virtual void SetPluginListForTesting( 141 virtual void SetPluginListForTesting(
144 webkit::npapi::PluginList* plugin_list) = 0; 142 webkit::npapi::PluginList* plugin_list) = 0;
145 }; 143 };
146 144
147 } // namespace content 145 } // namespace content
148 146
149 #endif // CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_H_ 147 #endif // CONTENT_PUBLIC_BROWSER_PLUGIN_SERVICE_H_
OLDNEW
« no previous file with comments | « content/browser/plugin_service_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698