mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

provide flag to set flash version

Browse source
This commit is contained in:
deepak1556 2015-05-06 13:29:23 +05:30
parent 1c190388e5
commit 853ce0bbd7
3 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
atom/app/atom_content_client.cc
View file

@ -30,24 +30,8 @@ namespace {
plugin.name = content::kFlashPluginName; plugin.name = content::kFlashPluginName;
plugin.path = path; plugin.path = path;
plugin.permissions = kPepperFlashPermissions; 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::WebPluginMimeType swf_mime_type(
content::kFlashPluginSwfMimeType, content::kFlashPluginSwfMimeType,
content::kFlashPluginSwfExtension, content::kFlashPluginSwfExtension,
@ -82,13 +66,15 @@ void AtomContentClient::AddAdditionalSchemes(
void AtomContentClient::AddPepperPlugins( void AtomContentClient::AddPepperPlugins(
std::vector<content::PepperPluginInfo>* plugins) { std::vector<content::PepperPluginInfo>* plugins) {
const base::CommandLine::StringType flash_path = auto command_line = base::CommandLine::ForCurrentProcess();
base::CommandLine::ForCurrentProcess()->GetSwitchValueNative( auto flash_path = command_line->GetSwitchValueNative(
switches::kPpapiFlashPath); switches::kPpapiFlashPath);
if (flash_path.empty()) if (flash_path.empty())
return; return;
std::string flash_version; auto flash_version = command_line->GetSwitchValueASCII(
switches::kPpapiFlashVersion);
plugins->push_back( plugins->push_back(
CreatePepperFlashInfo(base::FilePath(flash_path), flash_version)); CreatePepperFlashInfo(base::FilePath(flash_path), flash_version));
} }

3
atom/common/options_switches.cc
View file

@ -66,6 +66,9 @@ const char kEnablePlugins[] = "enable-plugins";
// Ppapi Flash path. // Ppapi Flash path.
const char kPpapiFlashPath[] = "ppapi-flash-path"; const char kPpapiFlashPath[] = "ppapi-flash-path";
// Ppapi Flash version.
const char kPpapiFlashVersion[] = "ppapi-flash-version";
// Instancd ID of guest WebContents. // Instancd ID of guest WebContents.
const char kGuestInstanceID[] = "guest-instance-id"; const char kGuestInstanceID[] = "guest-instance-id";

1
atom/common/options_switches.h
View file

@ -38,6 +38,7 @@ extern const char kDarkTheme[];
extern const char kDirectWrite[]; extern const char kDirectWrite[];
extern const char kEnablePlugins[]; extern const char kEnablePlugins[];
extern const char kPpapiFlashPath[]; extern const char kPpapiFlashPath[];
extern const char kPpapiFlashVersion[];
extern const char kGuestInstanceID[]; extern const char kGuestInstanceID[];
extern const char kPreloadScript[]; extern const char kPreloadScript[];
extern const char kTransparent[]; extern const char kTransparent[];