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

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

Issue 2191643002: Label sandbox job object OOM as OOM in process termination. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: should not include windows code in platform independent parts Created 4 years, 4 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 | « base/process/kill_win.cc ('k') | sandbox/win/src/sandbox_types.h » ('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 "content/public/app/content_main_runner.h" 5 #include "content/public/app/content_main_runner.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <string.h> 9 #include <string.h>
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "content/public/common/main_function_params.h" 60 #include "content/public/common/main_function_params.h"
61 #include "content/public/common/sandbox_init.h" 61 #include "content/public/common/sandbox_init.h"
62 #include "content/public/gpu/content_gpu_client.h" 62 #include "content/public/gpu/content_gpu_client.h"
63 #include "content/public/renderer/content_renderer_client.h" 63 #include "content/public/renderer/content_renderer_client.h"
64 #include "content/public/utility/content_utility_client.h" 64 #include "content/public/utility/content_utility_client.h"
65 #include "content/renderer/in_process_renderer_thread.h" 65 #include "content/renderer/in_process_renderer_thread.h"
66 #include "content/utility/in_process_utility_thread.h" 66 #include "content/utility/in_process_utility_thread.h"
67 #include "ipc/ipc_descriptors.h" 67 #include "ipc/ipc_descriptors.h"
68 #include "ipc/ipc_switches.h" 68 #include "ipc/ipc_switches.h"
69 #include "media/base/media.h" 69 #include "media/base/media.h"
70 #include "sandbox/win/src/sandbox_types.h"
71 #include "ui/base/ui_base_paths.h" 70 #include "ui/base/ui_base_paths.h"
72 #include "ui/base/ui_base_switches.h" 71 #include "ui/base/ui_base_switches.h"
73 72
74 #ifdef V8_USE_EXTERNAL_STARTUP_DATA 73 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
75 #include "gin/v8_initializer.h" 74 #include "gin/v8_initializer.h"
76 #endif 75 #endif
77 76
78 #if defined(OS_WIN) 77 #if defined(OS_WIN)
79 #include <malloc.h> 78 #include <malloc.h>
80 #include <cstring> 79 #include <cstring>
81 80
82 #include "base/trace_event/trace_event_etw_export_win.h" 81 #include "base/trace_event/trace_event_etw_export_win.h"
83 #include "base/win/process_startup_helper.h" 82 #include "base/win/process_startup_helper.h"
83 #include "sandbox/win/src/sandbox_types.h"
84 #include "ui/base/win/atl_module.h" 84 #include "ui/base/win/atl_module.h"
85 #include "ui/display/win/dpi.h" 85 #include "ui/display/win/dpi.h"
86 #elif defined(OS_MACOSX) 86 #elif defined(OS_MACOSX)
87 #include "base/mac/scoped_nsautorelease_pool.h" 87 #include "base/mac/scoped_nsautorelease_pool.h"
88 #include "base/power_monitor/power_monitor_device_source.h" 88 #include "base/power_monitor/power_monitor_device_source.h"
89 #include "content/app/mac/mac_init.h" 89 #include "content/app/mac/mac_init.h"
90 #include "content/browser/mach_broker_mac.h" 90 #include "content/browser/mach_broker_mac.h"
91 #include "content/common/sandbox_init_mac.h" 91 #include "content/common/sandbox_init_mac.h"
92 #endif // OS_WIN 92 #endif // OS_WIN
93 93
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 841
842 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 842 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
843 }; 843 };
844 844
845 // static 845 // static
846 ContentMainRunner* ContentMainRunner::Create() { 846 ContentMainRunner* ContentMainRunner::Create() {
847 return new ContentMainRunnerImpl(); 847 return new ContentMainRunnerImpl();
848 } 848 }
849 849
850 } // namespace content 850 } // namespace content
OLDNEW
« no previous file with comments | « base/process/kill_win.cc ('k') | sandbox/win/src/sandbox_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698