Add flash plugin path to chrome://version

chrome/browser/ui/webui/version_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/version_handler.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 91 matching lines @@
                                          exec_path, profile_path);
 }
 
 #if BUILDFLAG(ENABLE_PLUGINS)
 void VersionHandler::OnGotPlugins(
     const std::vector<content::WebPluginInfo>& plugins) {
   // Obtain the version of the first enabled Flash plugin.
   std::vector<content::WebPluginInfo> info_array;
   content::PluginService::GetInstance()->GetPluginInfoArray(
       GURL(), content::kFlashPluginSwfMimeType, false, &info_array, NULL);
-  base::string16 flash_version =
+  base::string16 flash_version_and_path =
       l10n_util::GetStringUTF16(IDS_PLUGINS_DISABLED_PLUGIN);

[Bernhard Bauer, 2017/01/03 15:23:17]

So, it looks like chrome://version is localized? If that is indeed the case,
manually concatenating strings like below might lead to wrong results, e.g. when
using RTL languages.

[Greg K, 2017/01/03 21:20:29]

Acknowledged.

   PluginPrefs* plugin_prefs =
       PluginPrefs::GetForProfile(Profile::FromWebUI(web_ui())).get();
   if (plugin_prefs) {
     for (size_t i = 0; i < info_array.size(); ++i) {
       if (plugin_prefs->IsPluginEnabled(info_array[i])) {
-        flash_version = info_array[i].version;
+        flash_version_and_path = info_array[i].version;
+        flash_version_and_path.append(base::UTF8ToUTF16(" "));

[Bernhard Bauer, 2017/01/03 15:23:17]

I would use base::ASCIIToUTF16() for the literal. But actually, should this be
base::StringPrintF()?

[Greg K, 2017/01/03 21:20:29]

I switched this to base::StringPrintf and tested with an RTL language (Hebrew),
and it produces the correct result.

+#if defined(OS_WIN)
+        flash_version_and_path.append(info_array[i].path.value());
+#else
+        flash_version_and_path.append(
+            base::UTF8ToUTF16(info_array[i].path.value()));

[Bernhard Bauer, 2017/01/03 15:23:17]

Use FilePath::LossyDisplayName() instead of platform-specific conversions.

[Greg K, 2017/01/03 21:20:29]

Done.

+#endif  // defined(OS_WIN)
         break;
       }
     }
   }
 
-  base::StringValue arg(flash_version);
+  base::StringValue arg(flash_version_and_path);
+
   web_ui()->CallJavascriptFunctionUnsafe(version_ui::kReturnFlashVersion, arg);
 }
 #endif  // BUILDFLAG(ENABLE_PLUGINS)