OLD | NEW |
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_GROUP_H_ | 5 #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_ |
6 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_ | 6 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 | 81 |
82 // Checks whether a plugin exists in the group with the given path. | 82 // Checks whether a plugin exists in the group with the given path. |
83 bool ContainsPlugin(const FilePath& path) const; | 83 bool ContainsPlugin(const FilePath& path) const; |
84 | 84 |
85 // Check if the group has no plugins. Could happen after a reload if the plug- | 85 // Check if the group has no plugins. Could happen after a reload if the plug- |
86 // in has disappeared from the pc (or in the process of updating). | 86 // in has disappeared from the pc (or in the process of updating). |
87 bool IsEmpty() const; | 87 bool IsEmpty() const; |
88 | 88 |
89 // Parse a version string as used by a plug-in. This method is more lenient | 89 // Parse a version string as used by a plug-in. This method is more lenient |
90 // in accepting weird version strings than Version::GetFromString(). | 90 // in accepting weird version strings than Version::GetFromString(). |
91 static Version* CreateVersionFromString(const string16& version_string); | 91 static void CreateVersionFromString(const string16& version_string, |
| 92 Version* version); |
92 | 93 |
93 const std::vector<webkit::WebPluginInfo>& web_plugin_infos() const { | 94 const std::vector<webkit::WebPluginInfo>& web_plugin_infos() const { |
94 return web_plugin_infos_; | 95 return web_plugin_infos_; |
95 } | 96 } |
96 | 97 |
97 private: | 98 private: |
98 friend class MockPluginList; | 99 friend class MockPluginList; |
99 friend class PluginGroupTest; | 100 friend class PluginGroupTest; |
100 friend class PluginList; | 101 friend class PluginList; |
101 friend class ::PluginExceptionsTableModelTest; | 102 friend class ::PluginExceptionsTableModelTest; |
(...skipping 30 matching lines...) Expand all Loading... |
132 std::string identifier_; | 133 std::string identifier_; |
133 string16 group_name_; | 134 string16 group_name_; |
134 string16 name_matcher_; | 135 string16 name_matcher_; |
135 std::vector<webkit::WebPluginInfo> web_plugin_infos_; | 136 std::vector<webkit::WebPluginInfo> web_plugin_infos_; |
136 }; | 137 }; |
137 | 138 |
138 } // namespace npapi | 139 } // namespace npapi |
139 } // namespace webkit | 140 } // namespace webkit |
140 | 141 |
141 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_ | 142 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_ |
OLD | NEW |