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

fix lint errors and add documentation

Browse source
This commit is contained in:
deepak1556 2015-05-10 10:25:19 +05:30
parent 853ce0bbd7
commit 15ae6b8d36
3 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
atom/app/atom_content_client.cc
View file

@ -10,41 +10,37 @@
#include "atom/common/chrome_version.h" #include "atom/common/chrome_version.h"
#include "atom/common/options_switches.h" #include "atom/common/options_switches.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "content/public/common/content_constants.h" #include "content/public/common/content_constants.h"
#include "content/public/common/pepper_plugin_info.h" #include "content/public/common/pepper_plugin_info.h"
#include "ppapi/shared_impl/ppapi_permissions.h" #include "ppapi/shared_impl/ppapi_permissions.h"
namespace atom { namespace atom {
int32 kPepperFlashPermissions = ppapi::PERMISSION_ALL_BITS;
namespace { namespace {
content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path, content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path,
const std::string& version) { const std::string& version) {
content::PepperPluginInfo plugin; content::PepperPluginInfo plugin;
plugin.is_out_of_process = true; plugin.is_out_of_process = true;
plugin.name = content::kFlashPluginName; plugin.name = content::kFlashPluginName;
plugin.path = path; plugin.path = path;
plugin.permissions = kPepperFlashPermissions; plugin.permissions = ppapi::PERMISSION_ALL_BITS;
plugin.version = version; plugin.version = version;
content::WebPluginMimeType swf_mime_type( content::WebPluginMimeType swf_mime_type(
content::kFlashPluginSwfMimeType, content::kFlashPluginSwfMimeType,
content::kFlashPluginSwfExtension, content::kFlashPluginSwfExtension,
content::kFlashPluginSwfDescription); content::kFlashPluginSwfDescription);
plugin.mime_types.push_back(swf_mime_type); plugin.mime_types.push_back(swf_mime_type);
content::WebPluginMimeType spl_mime_type( content::WebPluginMimeType spl_mime_type(
content::kFlashPluginSplMimeType, content::kFlashPluginSplMimeType,
content::kFlashPluginSplExtension, content::kFlashPluginSplExtension,
content::kFlashPluginSplDescription); content::kFlashPluginSplDescription);
plugin.mime_types.push_back(spl_mime_type); plugin.mime_types.push_back(spl_mime_type);
return plugin; return plugin;
} }
} // namespace } // namespace
@ -65,7 +61,7 @@ void AtomContentClient::AddAdditionalSchemes(
} }
void AtomContentClient::AddPepperPlugins( void AtomContentClient::AddPepperPlugins(
std::vector<content::PepperPluginInfo>* plugins) { std::vector<content::PepperPluginInfo>* plugins) {
auto command_line = base::CommandLine::ForCurrentProcess(); auto command_line = base::CommandLine::ForCurrentProcess();
auto flash_path = command_line->GetSwitchValueNative( auto flash_path = command_line->GetSwitchValueNative(
switches::kPpapiFlashPath); switches::kPpapiFlashPath);

8
atom/browser/atom_browser_client.cc
View file

@ -202,9 +202,11 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
void AtomBrowserClient::DidCreatePpapiPlugin( void AtomBrowserClient::DidCreatePpapiPlugin(
content::BrowserPpapiHost* browser_host) { content::BrowserPpapiHost* browser_host) {
browser_host->GetPpapiHost()->AddHostFactoryFilter( auto command_line = base::CommandLine::ForCurrentProcess();
scoped_ptr<ppapi::host::HostFactory>( if (command_line->HasSwitch(switches::kEnablePlugins))
new chrome::ChromeBrowserPepperHostFactory(browser_host))); browser_host->GetPpapiHost()->AddHostFactoryFilter(
scoped_ptr<ppapi::host::HostFactory>(
new chrome::ChromeBrowserPepperHostFactory(browser_host)));
} }
brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts( brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(

8
docs/api/chrome-command-line-switches.md
View file

@ -62,6 +62,14 @@ Like `--host-rules` but these `rules` only apply to the host resolver.
Ignore certificate related errors. Ignore certificate related errors.
## --ppapi-flash-path
Set path to pepper flash plugin for use.
## --ppapi-flash-version
Set the pepper flash version.
## --v=`log_level` ## --v=`log_level`
Gives the default maximal active V-logging level; 0 is the default. Normally Gives the default maximal active V-logging level; 0 is the default. Normally