diff options
| author | yoz <yoz@chromium.org> | 2014-09-22 20:00:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-23 03:01:03 +0000 |
| commit | 7e5386f556b5a821b2e64264fcdf5a428564abd0 (patch) | |
| tree | 446a170f6c5b89e21aac59084f3e06133df42f68 /extensions/shell/app | |
| parent | d817896458c8d1eaea1e09b3549126ab52658e3d (diff) | |
| download | chromium_src-7e5386f556b5a821b2e64264fcdf5a428564abd0.zip chromium_src-7e5386f556b5a821b2e64264fcdf5a428564abd0.tar.gz chromium_src-7e5386f556b5a821b2e64264fcdf5a428564abd0.tar.bz2 | |
Run app_shell on Windows.
Remove/ifdef (as appropriate) a few Linux-specific assumptions.
BUG=399363
TEST=app_shell_browsertests
Review URL: https://codereview.chromium.org/586583002
Cr-Commit-Position: refs/heads/master@{#296136}
Diffstat (limited to 'extensions/shell/app')
| -rw-r--r-- | extensions/shell/app/shell_main_delegate.cc | 12 | ||||
| -rw-r--r-- | extensions/shell/app/shell_main_delegate.h | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/extensions/shell/app/shell_main_delegate.cc b/extensions/shell/app/shell_main_delegate.cc index 2d6fe6f..e452e48 100644 --- a/extensions/shell/app/shell_main_delegate.cc +++ b/extensions/shell/app/shell_main_delegate.cc @@ -22,10 +22,12 @@ #endif #if !defined(DISABLE_NACL) -#include "components/nacl/common/nacl_paths.h" #include "components/nacl/common/nacl_switches.h" +#if defined(OS_LINUX) +#include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" -#endif +#endif // OS_LINUX +#endif // !DISABLE_NACL namespace { @@ -59,7 +61,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif -#if !defined(DISABLE_NACL) +#if !defined(DISABLE_NACL) && defined(OS_LINUX) nacl::RegisterPathProvider(); #endif extensions::RegisterPathProvider(); @@ -85,12 +87,14 @@ ShellMainDelegate::CreateContentRendererClient() { return renderer_client_.get(); } +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) void ShellMainDelegate::ZygoteStarting( ScopedVector<content::ZygoteForkDelegate>* delegates) { #if !defined(DISABLE_NACL) nacl::AddNaClZygoteForkDelegates(delegates); -#endif +#endif // DISABLE_NACL } +#endif // OS_POSIX && !OS_MACOSX && !OS_ANDROID content::ContentClient* ShellMainDelegate::CreateContentClient() { return new ShellContentClient(); diff --git a/extensions/shell/app/shell_main_delegate.h b/extensions/shell/app/shell_main_delegate.h index a117d69..f29ac42 100644 --- a/extensions/shell/app/shell_main_delegate.h +++ b/extensions/shell/app/shell_main_delegate.h @@ -30,8 +30,10 @@ 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. |