From 853ce0bbd7db0516147f2b1b2482fe557d0d18d4 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Wed, 6 May 2015 13:29:23 +0530
Subject: [PATCH] provide flag to set flash version

---
 atom/app/atom_content_client.cc | 28 +++++++---------------------
 atom/common/options_switches.cc |  3 +++
 atom/common/options_switches.h  |  1 +
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc
index ecc5c72155a4..c36a1e22c87d 100644
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -30,24 +30,8 @@ namespace {
     plugin.name = content::kFlashPluginName;
     plugin.path = path;
     plugin.permissions = kPepperFlashPermissions;
+    plugin.version = version;
 
-    std::vector<std::string> flash_version_numbers;
-    base::SplitString(version, '.', &flash_version_numbers);
-    if (flash_version_numbers.size() < 1)
-      flash_version_numbers.push_back("11");
-    // |SplitString()| puts in an empty string given an empty string. :(
-    else if (flash_version_numbers[0].empty())
-      flash_version_numbers[0] = "11";
-    if (flash_version_numbers.size() < 2)
-      flash_version_numbers.push_back("2");
-    if (flash_version_numbers.size() < 3)
-      flash_version_numbers.push_back("999");
-    if (flash_version_numbers.size() < 4)
-      flash_version_numbers.push_back("999");
-    // E.g., "Shockwave Flash 10.2 r154":
-    plugin.description = plugin.name + " " + flash_version_numbers[0] + "." +
-        flash_version_numbers[1] + " r" + flash_version_numbers[2];
-    plugin.version = JoinString(flash_version_numbers, '.');
     content::WebPluginMimeType swf_mime_type(
         content::kFlashPluginSwfMimeType,
         content::kFlashPluginSwfExtension,
@@ -82,13 +66,15 @@ void AtomContentClient::AddAdditionalSchemes(
 
 void AtomContentClient::AddPepperPlugins(
   std::vector<content::PepperPluginInfo>* plugins) {
-  const base::CommandLine::StringType flash_path =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
-          switches::kPpapiFlashPath);
+  auto command_line = base::CommandLine::ForCurrentProcess();
+  auto flash_path = command_line->GetSwitchValueNative(
+      switches::kPpapiFlashPath);
   if (flash_path.empty())
     return;
 
-  std::string flash_version;
+  auto flash_version = command_line->GetSwitchValueASCII(
+      switches::kPpapiFlashVersion);
+
   plugins->push_back(
       CreatePepperFlashInfo(base::FilePath(flash_path), flash_version));
 }
diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc
index 37daa894c6d8..13d1ad2571de 100644
--- a/atom/common/options_switches.cc
+++ b/atom/common/options_switches.cc
@@ -66,6 +66,9 @@ const char kEnablePlugins[] = "enable-plugins";
 // Ppapi Flash path.
 const char kPpapiFlashPath[] = "ppapi-flash-path";
 
+// Ppapi Flash version.
+const char kPpapiFlashVersion[] = "ppapi-flash-version";
+
 // Instancd ID of guest WebContents.
 const char kGuestInstanceID[] = "guest-instance-id";
 
diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h
index d6f8c072886c..8e7080ace45d 100644
--- a/atom/common/options_switches.h
+++ b/atom/common/options_switches.h
@@ -38,6 +38,7 @@ extern const char kDarkTheme[];
 extern const char kDirectWrite[];
 extern const char kEnablePlugins[];
 extern const char kPpapiFlashPath[];
+extern const char kPpapiFlashVersion[];
 extern const char kGuestInstanceID[];
 extern const char kPreloadScript[];
 extern const char kTransparent[];