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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 1851213002: Remove sandbox on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nacl compile issues Created 4 years, 8 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
« no previous file with comments | « chrome/app/chrome_exe_main_win.cc ('k') | chrome/app/main_dll_loader_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "ui/base/ui_base_switches.h" 55 #include "ui/base/ui_base_switches.h"
56 56
57 #if defined(OS_WIN) 57 #if defined(OS_WIN)
58 #include <atlbase.h> 58 #include <atlbase.h>
59 #include <malloc.h> 59 #include <malloc.h>
60 #include <algorithm> 60 #include <algorithm>
61 #include "base/debug/close_handle_hook_win.h" 61 #include "base/debug/close_handle_hook_win.h"
62 #include "chrome/common/child_process_logging.h" 62 #include "chrome/common/child_process_logging.h"
63 #include "chrome/common/v8_breakpad_support_win.h" 63 #include "chrome/common/v8_breakpad_support_win.h"
64 #include "components/crash/content/app/crashpad.h" 64 #include "components/crash/content/app/crashpad.h"
65 #include "sandbox/win/src/sandbox.h"
66 #include "ui/base/resource/resource_bundle_win.h" 65 #include "ui/base/resource/resource_bundle_win.h"
67 #endif 66 #endif
68 67
69 #if defined(OS_MACOSX) 68 #if defined(OS_MACOSX)
70 #include "base/mac/foundation_util.h" 69 #include "base/mac/foundation_util.h"
71 #include "chrome/app/chrome_main_mac.h" 70 #include "chrome/app/chrome_main_mac.h"
72 #include "chrome/browser/mac/relauncher.h" 71 #include "chrome/browser/mac/relauncher.h"
73 #include "chrome/common/mac/cfbundle_blocker.h" 72 #include "chrome/common/mac/cfbundle_blocker.h"
74 #include "components/crash/content/app/crashpad.h" 73 #include "components/crash/content/app/crashpad.h"
75 #include "components/crash/core/common/objc_zombie.h" 74 #include "components/crash/core/common/objc_zombie.h"
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 case version_info::Channel::CANARY: 1015 case version_info::Channel::CANARY:
1017 return true; 1016 return true;
1018 case version_info::Channel::DEV: 1017 case version_info::Channel::DEV:
1019 case version_info::Channel::BETA: 1018 case version_info::Channel::BETA:
1020 case version_info::Channel::STABLE: 1019 case version_info::Channel::STABLE:
1021 default: 1020 default:
1022 // Don't enable instrumentation. 1021 // Don't enable instrumentation.
1023 return false; 1022 return false;
1024 } 1023 }
1025 } 1024 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_exe_main_win.cc ('k') | chrome/app/main_dll_loader_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698