Index: apps/shell/app/shell_main_delegate.h |
diff --git a/apps/shell/app/shell_main_delegate.h b/apps/shell/app/shell_main_delegate.h |
index 6af939501a3896919eb1487ef07ea49769d8eea6..15b8c99492050e24a5848be1034fe1a6cb9daa2b 100644 |
--- a/apps/shell/app/shell_main_delegate.h |
+++ b/apps/shell/app/shell_main_delegate.h |
@@ -9,15 +9,20 @@ |
#include "base/memory/scoped_ptr.h" |
#include "content/public/app/content_main_delegate.h" |
-namespace apps { |
+namespace content { |
+class BrowserContext; |
+class ContentBrowserClient; |
+class ContentClient; |
+class ContentRendererClient; |
+} |
-class ShellContentBrowserClient; |
-class ShellContentClient; |
-class ShellContentRendererClient; |
+namespace apps { |
+class ShellBrowserMainDelegate; |
class ShellMainDelegate : public content::ContentMainDelegate { |
public: |
- ShellMainDelegate(); |
+ // |browser_main_delegate| is used only in the browser process. |
+ explicit ShellMainDelegate(ShellBrowserMainDelegate* browser_main_delegate); |
virtual ~ShellMainDelegate(); |
// ContentMainDelegate implementation: |
@@ -35,9 +40,9 @@ class ShellMainDelegate : public content::ContentMainDelegate { |
// Initializes the resource bundle and resources.pak. |
static void InitializeResourceBundle(); |
- scoped_ptr<ShellContentClient> content_client_; |
- scoped_ptr<ShellContentBrowserClient> browser_client_; |
- scoped_ptr<ShellContentRendererClient> renderer_client_; |
+ scoped_ptr<content::ContentClient> content_client_; |
+ scoped_ptr<content::ContentBrowserClient> browser_client_; |
+ scoped_ptr<content::ContentRendererClient> renderer_client_; |
DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); |
}; |