Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / public / common / main_function_params.h

diff --git a/src/content/public/common/main_function_params.h b/src/content/public/common/main_function_params.h
index c1700c7..e2756e7 100644 (file)
--- a/src/content/public/common/main_function_params.h
+++ b/src/content/public/common/main_function_params.h
@@ -9,8 +9,8 @@
 #ifndef CONTENT_PUBLIC_COMMON_MAIN_FUNCTION_PARAMS_H_
 #define CONTENT_PUBLIC_COMMON_MAIN_FUNCTION_PARAMS_H_
 
-#include "base/command_line.h"
 #include "base/callback_forward.h"
+#include "base/command_line.h"
 
 #if defined(OS_WIN)
 namespace sandbox {
@@ -27,20 +27,28 @@ class ScopedNSAutoreleasePool;
 namespace content {
 
 struct MainFunctionParams {
-  explicit MainFunctionParams(const CommandLine& cl)
+  explicit MainFunctionParams(const base::CommandLine& cl)
       : command_line(cl),
 #if defined(OS_WIN)
         sandbox_info(NULL),
 #elif defined(OS_MACOSX)
         autorelease_pool(NULL),
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
+        zygote_child(false),
 #endif
-        ui_task(NULL) {}
-  const CommandLine& command_line;
+        ui_task(NULL) {
+  }
+
+  const base::CommandLine& command_line;
+
 #if defined(OS_WIN)
   sandbox::SandboxInterfaceInfo* sandbox_info;
 #elif defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool* autorelease_pool;
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
+  bool zygote_child;
 #endif
+
   // Used by InProcessBrowserTest. If non-null BrowserMain schedules this
   // task to run on the MessageLoop and BrowserInit is not invoked.
   base::Closure* ui_task;