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

Side by Side Diff: content/shell/shell_main.cc

Issue 8414020: Expose the sandbox related code through the content API. I did a bit of cleanup while I was doing... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/app/content_main.h" 5 #include "content/app/content_main.h"
6 6
7 #include "content/shell/shell_main_delegate.h" 7 #include "content/shell/shell_main_delegate.h"
8 #include "sandbox/src/sandbox_types.h" 8 #include "sandbox/src/sandbox_types.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
11 #include "content/app/startup_helper_win.h" 11 #include "content/public/app/startup_helper_win.h"
12 #endif 12 #endif
13 13
14 #if defined(OS_WIN) 14 #if defined(OS_WIN)
15 15
16 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { 16 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
17 sandbox::SandboxInterfaceInfo sandbox_info = {0}; 17 sandbox::SandboxInterfaceInfo sandbox_info = {0};
18 content::InitializeSandboxInfo(&sandbox_info); 18 content::InitializeSandboxInfo(&sandbox_info);
19 ShellMainDelegate delegate; 19 ShellMainDelegate delegate;
20 return content::ContentMain(instance, &sandbox_info, &delegate); 20 return content::ContentMain(instance, &sandbox_info, &delegate);
21 } 21 }
22 #endif 22 #endif
23 23
24 #if defined(OS_POSIX) 24 #if defined(OS_POSIX)
25 25
26 #if defined(OS_MACOSX) 26 #if defined(OS_MACOSX)
27 __attribute__((visibility("default"))) 27 __attribute__((visibility("default")))
28 int main(int argc, const char* argv[]) { 28 int main(int argc, const char* argv[]) {
29 #else 29 #else
30 int main(int argc, const char** argv) { 30 int main(int argc, const char** argv) {
31 #endif // OS_MACOSX 31 #endif // OS_MACOSX
32 32
33 ShellMainDelegate delegate; 33 ShellMainDelegate delegate;
34 return content::ContentMain(argc, argv, &delegate); 34 return content::ContentMain(argc, argv, &delegate);
35 } 35 }
36 36
37 #endif // OS_POSIX 37 #endif // OS_POSIX
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698