Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / extensions / shell / app / shell_main_delegate.h

diff --git a/src/extensions/shell/app/shell_main_delegate.h b/src/extensions/shell/app/shell_main_delegate.h
index 7e120f4..f29ac42 100644 (file)
--- a/src/extensions/shell/app/shell_main_delegate.h
+++ b/src/extensions/shell/app/shell_main_delegate.h
@@ -18,7 +18,6 @@ class ContentRendererClient;
 
 namespace extensions {
 class ShellBrowserMainDelegate;
-class ShellRendererMainDelegate;
 
 class ShellMainDelegate : public content::ContentMainDelegate {
  public:
@@ -31,14 +30,16 @@ class ShellMainDelegate : public content::ContentMainDelegate {
   virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
   virtual content::ContentRendererClient* CreateContentRendererClient()
       OVERRIDE;
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+  virtual void ZygoteStarting(
+      ScopedVector<content::ZygoteForkDelegate>* delegates) OVERRIDE;
+#endif
 
  protected:
   // The created object is owned by this object.
+  virtual content::ContentClient* CreateContentClient();
   virtual content::ContentBrowserClient* CreateShellContentBrowserClient();
-
-  // The returned object is owned by ShellContentRendererClient.
-  virtual scoped_ptr<ShellRendererMainDelegate>
-      CreateShellRendererMainDelegate();
+  virtual content::ContentRendererClient* CreateShellContentRendererClient();
 
   // Initializes the resource bundle and resources.pak.
   virtual void InitializeResourceBundle();