Upstream BrowserChildProcessHostImpl

content/browser/ppapi_plugin_process_host.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 "content/browser/ppapi_plugin_process_host.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 224 matching lines @@
   if (!is_broker_) {
     // TODO(vtl): Stop passing flash args in the command line, on windows is
     // going to explode.
     static const char* kPluginForwardSwitches[] = {
       switches::kDisableSeccompFilterSandbox,
 #if defined(OS_MACOSX)
       switches::kEnableSandboxLogging,
 #endif
       switches::kNoSandbox,
       switches::kPpapiFlashArgs,
-      switches::kPpapiStartupDialog,
+      switches::kPpapiStartupDialog
     };
     cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches,
                                arraysize(kPluginForwardSwitches));
   }
 
   std::string locale =
       content::GetContentClient()->browser()->GetApplicationLocale();
   if (!locale.empty()) {
     // Pass on the locale so the plugin will know what language we're using.
     cmd_line->AppendSwitchASCII(switches::kLang, locale);
   }
 
   if (!plugin_launcher.empty())
     cmd_line->PrependWrapper(plugin_launcher);
 
+  base::EnvironmentVector env;

[Yaron, 2012/10/09 21:38:53]

I think we can just drop this. We don't use plugin proceses.

[Yusuf, 2012/10/10 00:06:08]

Done.

+#if defined(OS_ANDROID)
+  BrowserChildProcessHostImpl::AppendCommonChildCommandLine(cmd_line);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kPpapiStartupDialog)) {
+    cmd_line->AppendSwitch(switches::kPpapiStartupDialog);
+  }
+#endif
+
   // On posix, never use the zygote for the broker. Also, only use the zygote if
   // the plugin is sandboxed, and we are not using a plugin launcher - having a
   // plugin launcher means we need to use another process instead of just
   // forking the zygote.
 #if defined(OS_POSIX)
   bool use_zygote = !is_broker_ && plugin_launcher.empty() && info.is_sandboxed;
   if (!info.is_sandboxed)
     cmd_line->AppendSwitchASCII(switches::kNoSandbox, "");
 #endif  // OS_POSIX
   process_->Launch(
@@ skipping 88 matching lines @@
   if (sent_requests_.empty())
     return;
 
   // All requests should be processed FIFO, so the next item in the
   // sent_requests_ queue should be the one that the plugin just created.
   Client* client = sent_requests_.front();
   sent_requests_.pop();
 
   client->OnPpapiChannelOpened(channel_handle, process_->GetData().id);
 }