Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: extensions/shell/app/shell_main.cc

Issue 745093002: AppShell support for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix win Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/app/content_main.h" 5 #include "content/public/app/content_main.h"
6 #include "extensions/shell/app/shell_main_delegate.h" 6 #include "extensions/shell/app/shell_main_delegate.h"
7 7
8 #if defined(OS_WIN) 8 #if defined(OS_WIN)
9 #include "content/public/app/startup_helper_win.h" 9 #include "content/public/app/startup_helper_win.h"
10 #include "sandbox/win/src/sandbox_types.h" 10 #include "sandbox/win/src/sandbox_types.h"
11 #endif 11 #endif
12 12
13 #if defined(OS_MACOSX)
14 #include "extensions/shell/app/shell_main_mac.h"
15 #endif
16
13 #if defined(OS_WIN) 17 #if defined(OS_WIN)
14 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { 18 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
15 #else 19 #else
16 int main(int argc, const char** argv) { 20 int main(int argc, const char** argv) {
17 #endif 21 #endif
22 #if defined(OS_MACOSX)
23 // Do the delegate work in shell_main_mac to avoid having to export the
24 // delegate types.
25 return ::ContentMain(argc, argv);
26 #else
James Cook 2014/12/10 21:05:00 This is turned into ifdef soup. What do you think
Yoyo Zhou 2014/12/11 02:40:49 You're right - this is completely unreadable.
18 extensions::ShellMainDelegate delegate; 27 extensions::ShellMainDelegate delegate;
19 content::ContentMainParams params(&delegate); 28 content::ContentMainParams params(&delegate);
20 29
21 #if defined(OS_WIN) 30 #if defined(OS_WIN)
22 sandbox::SandboxInterfaceInfo sandbox_info = {0}; 31 sandbox::SandboxInterfaceInfo sandbox_info = {0};
23 content::InitializeSandboxInfo(&sandbox_info); 32 content::InitializeSandboxInfo(&sandbox_info);
24 params.instance = instance; 33 params.instance = instance;
25 params.sandbox_info = &sandbox_info; 34 params.sandbox_info = &sandbox_info;
26 #else 35 #else
27 params.argc = argc; 36 params.argc = argc;
28 params.argv = argv; 37 params.argv = argv;
29 #endif 38 #endif // OS_WIN
30 39
31 return content::ContentMain(params); 40 return content::ContentMain(params);
41 #endif // OS_MACOSX
32 } 42 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698