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

Side by Side Diff: content/app/content_main.cc

Issue 8589001: Load mac sandbox definitions from resources instead of the bundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 9 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 | 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 "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/debugger.h" 9 #include "base/debug/debugger.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 22 matching lines...) Expand all
33 33
34 #if defined(OS_WIN) 34 #if defined(OS_WIN)
35 #include <atlbase.h> 35 #include <atlbase.h>
36 #include <atlapp.h> 36 #include <atlapp.h>
37 #include <malloc.h> 37 #include <malloc.h>
38 #elif defined(OS_MACOSX) 38 #elif defined(OS_MACOSX)
39 #include "base/mac/scoped_nsautorelease_pool.h" 39 #include "base/mac/scoped_nsautorelease_pool.h"
40 #include "base/mach_ipc_mac.h" 40 #include "base/mach_ipc_mac.h"
41 #include "base/system_monitor/system_monitor.h" 41 #include "base/system_monitor/system_monitor.h"
42 #include "content/browser/mach_broker_mac.h" 42 #include "content/browser/mach_broker_mac.h"
43 #include "content/common/sandbox_init_mac.h"
43 #endif // OS_WIN 44 #endif // OS_WIN
44 45
45 #if defined(OS_POSIX) 46 #if defined(OS_POSIX)
46 #include <signal.h> 47 #include <signal.h>
47 48
48 #include "base/global_descriptors_posix.h" 49 #include "base/global_descriptors_posix.h"
49 #include "content/common/chrome_descriptors.h" 50 #include "content/common/chrome_descriptors.h"
50 51
51 #if !defined(OS_MACOSX) 52 #if !defined(OS_MACOSX)
52 #include "content/public/common/zygote_fork_delegate_linux.h" 53 #include "content/public/common/zygote_fork_delegate_linux.h"
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 _CrtDumpMemoryLeaks(); 460 _CrtDumpMemoryLeaks();
460 #endif // _CRTDBG_MAP_ALLOC 461 #endif // _CRTDBG_MAP_ALLOC
461 462
462 _Module.Term(); 463 _Module.Term();
463 #endif // OS_WIN 464 #endif // OS_WIN
464 465
465 return exit_code; 466 return exit_code;
466 } 467 }
467 468
468 } // namespace content 469 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698