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

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

Issue 8687014: Remove a few static initializers. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: . Created 9 years 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
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 #include <algorithm> 5 #include <algorithm>
6 6
7 #include "webkit/plugins/npapi/plugin_group.h" 7 #include "webkit/plugins/npapi/plugin_group.h"
8 8
9 #include "base/memory/linked_ptr.h" 9 #include "base/memory/linked_ptr.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/sys_string_conversions.h" 11 #include "base/sys_string_conversions.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "base/version.h" 14 #include "base/version.h"
15 #include "webkit/plugins/npapi/plugin_list.h" 15 #include "webkit/plugins/npapi/plugin_list.h"
16 #include "webkit/plugins/webplugininfo.h" 16 #include "webkit/plugins/webplugininfo.h"
17 17
18 namespace webkit { 18 namespace webkit {
19 namespace npapi { 19 namespace npapi {
20 20
21 const char* PluginGroup::kAdobeReaderGroupName = "Adobe Acrobat"; 21 // static
22 const char* PluginGroup::kAdobeReaderUpdateURL = "http://get.adobe.com/reader/"; 22 const char PluginGroup::kAdobeReaderGroupName[] = "Adobe Acrobat";
23 const char* PluginGroup::kJavaGroupName = "Java"; 23 const char PluginGroup::kAdobeReaderUpdateURL[] =
24 const char* PluginGroup::kQuickTimeGroupName = "QuickTime"; 24 "http://get.adobe.com/reader/";
25 const char* PluginGroup::kShockwaveGroupName = "Shockwave"; 25 const char PluginGroup::kJavaGroupName[] = "Java";
26 const char* PluginGroup::kRealPlayerGroupName = "RealPlayer"; 26 const char PluginGroup::kQuickTimeGroupName[] = "QuickTime";
27 const char* PluginGroup::kSilverlightGroupName = "Silverlight"; 27 const char PluginGroup::kShockwaveGroupName[] = "Shockwave";
28 const char* PluginGroup::kWindowsMediaPlayerGroupName = "Windows Media Player"; 28 const char PluginGroup::kRealPlayerGroupName[] = "RealPlayer";
29 const char PluginGroup::kSilverlightGroupName[] = "Silverlight";
30 const char PluginGroup::kWindowsMediaPlayerGroupName[] = "Windows Media Player";
29 31
30 VersionRange::VersionRange(const VersionRangeDefinition& definition) 32 VersionRange::VersionRange(const VersionRangeDefinition& definition)
31 : low_str(definition.version_matcher_low), 33 : low_str(definition.version_matcher_low),
32 high_str(definition.version_matcher_high), 34 high_str(definition.version_matcher_high),
33 min_str(definition.min_version), 35 min_str(definition.min_version),
34 requires_authorization(definition.requires_authorization) { 36 requires_authorization(definition.requires_authorization) {
35 if (!low_str.empty()) 37 if (!low_str.empty())
36 low.reset(Version::GetVersionFromString(low_str)); 38 low.reset(Version::GetVersionFromString(low_str));
37 if (!high_str.empty()) 39 if (!high_str.empty())
38 high.reset(Version::GetVersionFromString(high_str)); 40 high.reset(Version::GetVersionFromString(high_str));
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 } 268 }
267 return false; 269 return false;
268 } 270 }
269 271
270 bool PluginGroup::IsEmpty() const { 272 bool PluginGroup::IsEmpty() const {
271 return web_plugin_infos_.empty(); 273 return web_plugin_infos_.empty();
272 } 274 }
273 275
274 } // namespace npapi 276 } // namespace npapi
275 } // namespace webkit 277 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698