Show version of Flash plugin on about:version. If no flash plugin is

chrome/browser/browser_about_handler.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/browser_about_handler.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 39 matching lines @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/plugins/npapi/webplugininfo.h"
+
 #ifdef CHROME_V8
 #include "v8/include/v8.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/enumerate_modules_model_win.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros/syslogs_library.h"
@@ skipping 674 matching lines @@
   std::string js_version(v8::V8::GetVersion());
   std::string js_engine = "V8";
 #else
   std::string js_version = webkit_version;
   std::string js_engine = "JavaScriptCore";
 #endif
 
   localized_strings->SetString("name",
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   localized_strings->SetString("version", version_info.Version());
-  localized_strings->SetString("version_modifier",
-                               platform_util::GetVersionStringModifier());
+  {
+    // Bug 79458: Need to evaluate the use of getting the version string on
+    // this thread.
+    base::ThreadRestrictions::ScopedAllowIO allow_io;
+    localized_strings->SetString("version_modifier",
+                                 platform_util::GetVersionStringModifier());
+  }
   localized_strings->SetString("js_engine", js_engine);
   localized_strings->SetString("js_version", js_version);
+
+  // Obtain the version of the first enabled Flash plugin.
+  std::vector<webkit::npapi::WebPluginInfo> info_array;
+  webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
+      GURL(), "application/x-shockwave-flash", false, &info_array, NULL);
+  string16 flash_version =
+      l10n_util::GetStringUTF16(IDS_PLUGINS_DISABLED_PLUGIN);
+  for (size_t i = 0; i < info_array.size(); ++i) {
+    if (webkit::npapi::IsPluginEnabled(info_array[i])) {

[cpu_(ooo_6.6-7.5), 2011/04/15 21:16:33]

does this cause the plugin dll to be loaded on this thread?

+      flash_version = info_array[i].version;
+      break;
+    }
+  }
+  localized_strings->SetString("flash_plugin", "Flash");
+  localized_strings->SetString("flash_version", flash_version);
   localized_strings->SetString("webkit_version", webkit_version);
   localized_strings->SetString("company",
       l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COMPANY_NAME));
   localized_strings->SetString("copyright",
       l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT));
   localized_strings->SetString("cl", version_info.LastChange());
   localized_strings->SetString("official",
       l10n_util::GetStringUTF16(
           version_info.IsOfficialBuild() ?
               IDS_ABOUT_VERSION_OFFICIAL
@@ skipping 441 matching lines @@
   return false;
 }
 
 std::vector<std::string> AboutPaths() {
   std::vector<std::string> paths;
   paths.reserve(arraysize(kAllAboutPaths));
   for (size_t i = 0; i < arraysize(kAllAboutPaths); i++)
     paths.push_back(kAllAboutPaths[i]);
   return paths;
 }