Reland 116136:

Add Silverlight to plugin information JSON files, and add help URLs for other plug-ins. 

Original review: http://codereview.chromium.org/8729025/

TBR=arv@chromium.org 

BUG=102987
TEST="Problems installing" link on missing plug-in infobar goes to a different URL for each plug-in.


Review URL: http://codereview.chromium.org/9085010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116476 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 1 deletions

diff --git a/chrome/browser/plugin_finder.h b/chrome/browser/plugin_finder.h
index 3359edb..a0e88b7 100644
--- a/chrome/browser/plugin_finder.h
+++ b/chrome/browser/plugin_finder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -27,6 +27,10 @@ class PluginFinder {
 
   static PluginFinder* GetInstance();
 
+  // Loads the plug-in information from the browser resources and parses it.
+  // Returns NULL if the plug-in list couldn't be parsed.
+  static scoped_ptr<base::ListValue> LoadPluginList();
+
   // Finds a plug-in for the given MIME type and language (specified as an IETF
   // language tag, i.e. en-US) and calls one of the two passed in callbacks,
   // depending on whether a plug-in is found.
@@ -41,6 +45,8 @@ class PluginFinder {
   PluginFinder();
   ~PluginFinder();
 
+  static base::ListValue* LoadPluginListInternal();
+
   scoped_ptr<base::ListValue> plugin_list_;
   std::map<std::string, PluginInstaller*> installers_;