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

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

Issue 10066016: Fix plug-in identifier for Shockwave and add a unit test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | « chrome/browser/resources/plugins_win.json ('k') | webkit/plugins/npapi/plugin_list.h » ('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) 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 bool IsEmpty() const; 126 bool IsEmpty() const;
127 127
128 // Parse a version string as used by a plug-in. This method is more lenient 128 // Parse a version string as used by a plug-in. This method is more lenient
129 // in accepting weird version strings than Version::GetFromString(). 129 // in accepting weird version strings than Version::GetFromString().
130 static Version* CreateVersionFromString(const string16& version_string); 130 static Version* CreateVersionFromString(const string16& version_string);
131 131
132 const std::vector<webkit::WebPluginInfo>& web_plugin_infos() const { 132 const std::vector<webkit::WebPluginInfo>& web_plugin_infos() const {
133 return web_plugin_infos_; 133 return web_plugin_infos_;
134 } 134 }
135 135
136 const std::vector<VersionRange>& version_ranges() const {
137 return version_ranges_;
138 }
139
136 private: 140 private:
137 friend class MockPluginList; 141 friend class MockPluginList;
138 friend class PluginGroupTest; 142 friend class PluginGroupTest;
139 friend class PluginList; 143 friend class PluginList;
140 friend class ::PluginExceptionsTableModelTest; 144 friend class ::PluginExceptionsTableModelTest;
141 FRIEND_TEST_ALL_PREFIXES(PluginListTest, DisableOutdated); 145 FRIEND_TEST_ALL_PREFIXES(PluginListTest, DisableOutdated);
142 146
143 // Generates the (short) identifier string for the given plugin. 147 // Generates the (short) identifier string for the given plugin.
144 static std::string GetIdentifier(const webkit::WebPluginInfo& wpi); 148 static std::string GetIdentifier(const webkit::WebPluginInfo& wpi);
145 149
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 string16 group_name_; 185 string16 group_name_;
182 string16 name_matcher_; 186 string16 name_matcher_;
183 std::vector<VersionRange> version_ranges_; 187 std::vector<VersionRange> version_ranges_;
184 std::vector<webkit::WebPluginInfo> web_plugin_infos_; 188 std::vector<webkit::WebPluginInfo> web_plugin_infos_;
185 }; 189 };
186 190
187 } // namespace npapi 191 } // namespace npapi
188 } // namespace webkit 192 } // namespace webkit
189 193
190 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_ 194 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_GROUP_H_
OLDNEW
« no previous file with comments | « chrome/browser/resources/plugins_win.json ('k') | webkit/plugins/npapi/plugin_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698