diff options
| author | yoz <yoz@chromium.org> | 2014-11-19 14:00:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-19 22:01:44 +0000 |
| commit | 0e463fafeca7afbda7e4060a7ce591f7eab82c2f (patch) | |
| tree | 96f46ca64ac05eb5bd1d1c7af8862966afbfb25e /extensions/shell/app | |
| parent | d48d16fd939c8fa9ef6473ff99f92c643c901542 (diff) | |
| download | chromium_src-0e463fafeca7afbda7e4060a7ce591f7eab82c2f.zip chromium_src-0e463fafeca7afbda7e4060a7ce591f7eab82c2f.tar.gz chromium_src-0e463fafeca7afbda7e4060a7ce591f7eab82c2f.tar.bz2 | |
Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-Aura implementations.
Rename ShellDesktopController to ShellDesktopControllerAura; make ShellNativeAppWindow implement only some of the BaseWindow methods, and move aura-specific bits to ShellNativeAppWindowAura. Adds a unit test for ShellNativeAppWindowAura.
This is a precursor to a Cocoa implementation for Mac.
BUG=399363
TBR=danakj@chromium.org,reed@google.com
Review URL: https://codereview.chromium.org/696063008
Cr-Commit-Position: refs/heads/master@{#304897}
Diffstat (limited to 'extensions/shell/app')
| -rw-r--r-- | extensions/shell/app/shell_main_delegate.cc | 7 | ||||
| -rw-r--r-- | extensions/shell/app/shell_main_delegate.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/extensions/shell/app/shell_main_delegate.cc b/extensions/shell/app/shell_main_delegate.cc index d7aa5ab..69f0e61 100644 --- a/extensions/shell/app/shell_main_delegate.cc +++ b/extensions/shell/app/shell_main_delegate.cc @@ -26,8 +26,10 @@ #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 // OS_LINUX +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#include "components/nacl/zygote/nacl_fork_delegate_linux.h" +#endif // OS_POSIX && !OS_MACOSX && !OS_ANDROID #endif // !DISABLE_NACL namespace { @@ -140,6 +142,9 @@ bool ShellMainDelegate::ProcessNeedsResourceBundle( #if !defined(DISABLE_NACL) process_type == switches::kNaClLoaderProcess || #endif +#if defined(OS_MACOSX) + process_type == switches::kGpuProcess || +#endif process_type == switches::kUtilityProcess; } diff --git a/extensions/shell/app/shell_main_delegate.h b/extensions/shell/app/shell_main_delegate.h index 587de92..e736602 100644 --- a/extensions/shell/app/shell_main_delegate.h +++ b/extensions/shell/app/shell_main_delegate.h @@ -30,7 +30,8 @@ class ShellMainDelegate : public content::ContentMainDelegate { content::ContentBrowserClient* CreateContentBrowserClient() override; content::ContentRendererClient* CreateContentRendererClient() override; content::ContentUtilityClient* CreateContentUtilityClient() override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ + !defined(OS_IOS) void ZygoteStarting( ScopedVector<content::ZygoteForkDelegate>* delegates) override; #endif |