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

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

Issue 1315303004: Turn components/crash into a layered component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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_crash_reporter_client.h ('k') | chrome/app/client_util.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 "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "sandbox/win/src/sandbox.h" 57 #include "sandbox/win/src/sandbox.h"
58 #include "ui/base/resource/resource_bundle_win.h" 58 #include "ui/base/resource/resource_bundle_win.h"
59 #endif 59 #endif
60 60
61 #if defined(OS_MACOSX) 61 #if defined(OS_MACOSX)
62 #include "base/mac/foundation_util.h" 62 #include "base/mac/foundation_util.h"
63 #include "chrome/app/chrome_main_mac.h" 63 #include "chrome/app/chrome_main_mac.h"
64 #include "chrome/browser/mac/relauncher.h" 64 #include "chrome/browser/mac/relauncher.h"
65 #include "chrome/common/mac/cfbundle_blocker.h" 65 #include "chrome/common/mac/cfbundle_blocker.h"
66 #include "chrome/common/mac/objc_zombie.h" 66 #include "chrome/common/mac/objc_zombie.h"
67 #include "components/crash/app/crashpad_mac.h" 67 #include "components/crash/content/app/crashpad_mac.h"
68 #include "ui/base/l10n/l10n_util_mac.h" 68 #include "ui/base/l10n/l10n_util_mac.h"
69 #endif 69 #endif
70 70
71 #if defined(OS_POSIX) 71 #if defined(OS_POSIX)
72 #include <locale.h> 72 #include <locale.h>
73 #include <signal.h> 73 #include <signal.h>
74 #include "chrome/app/chrome_crash_reporter_client.h" 74 #include "chrome/app/chrome_crash_reporter_client.h"
75 #include "components/crash/app/crash_reporter_client.h" 75 #include "components/crash/content/app/crash_reporter_client.h"
76 #endif 76 #endif
77 77
78 #if !defined(DISABLE_NACL) && defined(OS_LINUX) 78 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
79 #include "components/nacl/common/nacl_paths.h" 79 #include "components/nacl/common/nacl_paths.h"
80 #include "components/nacl/zygote/nacl_fork_delegate_linux.h" 80 #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
81 #endif 81 #endif
82 82
83 #if defined(OS_CHROMEOS) 83 #if defined(OS_CHROMEOS)
84 #include "base/sys_info.h" 84 #include "base/sys_info.h"
85 #include "chrome/browser/chromeos/boot_times_recorder.h" 85 #include "chrome/browser/chromeos/boot_times_recorder.h"
(...skipping 10 matching lines...) Expand all
96 #include "chrome/browser/diagnostics/diagnostics_writer.h" 96 #include "chrome/browser/diagnostics/diagnostics_writer.h"
97 #endif 97 #endif
98 98
99 #if defined(USE_X11) 99 #if defined(USE_X11)
100 #include <stdlib.h> 100 #include <stdlib.h>
101 #include <string.h> 101 #include <string.h>
102 #include "ui/base/x/x11_util.h" 102 #include "ui/base/x/x11_util.h"
103 #endif 103 #endif
104 104
105 #if defined(OS_POSIX) && !defined(OS_MACOSX) 105 #if defined(OS_POSIX) && !defined(OS_MACOSX)
106 #include "components/crash/app/breakpad_linux.h" 106 #include "components/crash/content/app/breakpad_linux.h"
107 #endif 107 #endif
108 108
109 #if defined(OS_LINUX) 109 #if defined(OS_LINUX)
110 #include "base/environment.h" 110 #include "base/environment.h"
111 #endif 111 #endif
112 112
113 #if defined(OS_MACOSX) || defined(OS_WIN) 113 #if defined(OS_MACOSX) || defined(OS_WIN)
114 #include "chrome/browser/policy/policy_path_parser.h" 114 #include "chrome/browser/policy/policy_path_parser.h"
115 #endif 115 #endif
116 116
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
955 case version_info::Channel::CANARY: 955 case version_info::Channel::CANARY:
956 return true; 956 return true;
957 case version_info::Channel::DEV: 957 case version_info::Channel::DEV:
958 case version_info::Channel::BETA: 958 case version_info::Channel::BETA:
959 case version_info::Channel::STABLE: 959 case version_info::Channel::STABLE:
960 default: 960 default:
961 // Don't enable instrumentation. 961 // Don't enable instrumentation.
962 return false; 962 return false;
963 } 963 }
964 } 964 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_crash_reporter_client.h ('k') | chrome/app/client_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698