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

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

Issue 10689170: Move the Windows sandbox to sandbox/win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on top of tree (properly this time) Created 8 years, 5 months 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 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/win/src/sandbox_types.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
11 #include "content/public/app/startup_helper_win.h" 11 #include "content/public/app/startup_helper_win.h"
12 #endif 12 #endif
13 13
14 #if defined(OS_MACOSX) 14 #if defined(OS_MACOSX)
15 #include "content/shell/shell_content_main.h" 15 #include "content/shell/shell_content_main.h"
16 #endif 16 #endif
17 17
18 #if defined(OS_WIN) 18 #if defined(OS_WIN)
(...skipping 12 matching lines...) Expand all
31 // Do the delegate work in shell_content_main to avoid having to export the 31 // Do the delegate work in shell_content_main to avoid having to export the
32 // delegate types. 32 // delegate types.
33 return ::ContentMain(argc, argv); 33 return ::ContentMain(argc, argv);
34 #else 34 #else
35 ShellMainDelegate delegate; 35 ShellMainDelegate delegate;
36 return content::ContentMain(argc, argv, &delegate); 36 return content::ContentMain(argc, argv, &delegate);
37 #endif // OS_MACOSX 37 #endif // OS_MACOSX
38 } 38 }
39 39
40 #endif // OS_POSIX 40 #endif // OS_POSIX
OLDNEW
« no previous file with comments | « content/renderer/renderer_main_platform_delegate_win.cc ('k') | content/test/browser_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698