diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc
index c36a1e22c87df..c8a591a59cc43 100644
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -10,41 +10,37 @@
 #include "atom/common/chrome_version.h"
 #include "atom/common/options_switches.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/pepper_plugin_info.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
 namespace atom {
 
-int32 kPepperFlashPermissions = ppapi::PERMISSION_ALL_BITS;
-
 namespace {
 
-  content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path,
-                                                  const std::string& version) {
-    content::PepperPluginInfo plugin;
-
-    plugin.is_out_of_process = true;
-    plugin.name = content::kFlashPluginName;
-    plugin.path = path;
-    plugin.permissions = kPepperFlashPermissions;
-    plugin.version = version;
-
-    content::WebPluginMimeType swf_mime_type(
-        content::kFlashPluginSwfMimeType,
-        content::kFlashPluginSwfExtension,
-        content::kFlashPluginSwfDescription);
-    plugin.mime_types.push_back(swf_mime_type);
-    content::WebPluginMimeType spl_mime_type(
-        content::kFlashPluginSplMimeType,
-        content::kFlashPluginSplExtension,
-        content::kFlashPluginSplDescription);
-    plugin.mime_types.push_back(spl_mime_type);
-
-    return plugin;
-  }
+content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path,
+                                                const std::string& version) {
+  content::PepperPluginInfo plugin;
+
+  plugin.is_out_of_process = true;
+  plugin.name = content::kFlashPluginName;
+  plugin.path = path;
+  plugin.permissions = ppapi::PERMISSION_ALL_BITS;
+  plugin.version = version;
+
+  content::WebPluginMimeType swf_mime_type(
+      content::kFlashPluginSwfMimeType,
+      content::kFlashPluginSwfExtension,
+      content::kFlashPluginSwfDescription);
+  plugin.mime_types.push_back(swf_mime_type);
+  content::WebPluginMimeType spl_mime_type(
+      content::kFlashPluginSplMimeType,
+      content::kFlashPluginSplExtension,
+      content::kFlashPluginSplDescription);
+  plugin.mime_types.push_back(spl_mime_type);
+
+  return plugin;
+}
 
 }  // namespace
 
@@ -65,7 +61,7 @@ void AtomContentClient::AddAdditionalSchemes(
 }
 
 void AtomContentClient::AddPepperPlugins(
-  std::vector<content::PepperPluginInfo>* plugins) {
+    std::vector<content::PepperPluginInfo>* plugins) {
   auto command_line = base::CommandLine::ForCurrentProcess();
   auto flash_path = command_line->GetSwitchValueNative(
       switches::kPpapiFlashPath);
diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index 69ae0d3830cdc..1d00f6bdcf03c 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -202,9 +202,11 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
 
 void AtomBrowserClient::DidCreatePpapiPlugin(
     content::BrowserPpapiHost* browser_host) {
-  browser_host->GetPpapiHost()->AddHostFactoryFilter(
-    scoped_ptr<ppapi::host::HostFactory>(
-      new chrome::ChromeBrowserPepperHostFactory(browser_host)));
+  auto command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kEnablePlugins))
+    browser_host->GetPpapiHost()->AddHostFactoryFilter(
+        scoped_ptr<ppapi::host::HostFactory>(
+            new chrome::ChromeBrowserPepperHostFactory(browser_host)));
 }
 
 brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(
diff --git a/docs/api/chrome-command-line-switches.md b/docs/api/chrome-command-line-switches.md
index de124ac8ceba1..fe22bd2c08abd 100644
--- a/docs/api/chrome-command-line-switches.md
+++ b/docs/api/chrome-command-line-switches.md
@@ -62,6 +62,14 @@ Like `--host-rules` but these `rules` only apply to the host resolver.
 
 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`
 
 Gives the default maximal active V-logging level; 0 is the default. Normally