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

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

Issue 485893007: Rename components/breakpad to components/crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + iOS tests Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/chrome_breakpad_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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "ui/base/resource/resource_bundle_win.h" 50 #include "ui/base/resource/resource_bundle_win.h"
51 #endif 51 #endif
52 52
53 #if defined(OS_MACOSX) 53 #if defined(OS_MACOSX)
54 #include "base/mac/mac_util.h" 54 #include "base/mac/mac_util.h"
55 #include "base/mac/os_crash_dumps.h" 55 #include "base/mac/os_crash_dumps.h"
56 #include "chrome/app/chrome_main_mac.h" 56 #include "chrome/app/chrome_main_mac.h"
57 #include "chrome/browser/mac/relauncher.h" 57 #include "chrome/browser/mac/relauncher.h"
58 #include "chrome/common/mac/cfbundle_blocker.h" 58 #include "chrome/common/mac/cfbundle_blocker.h"
59 #include "chrome/common/mac/objc_zombie.h" 59 #include "chrome/common/mac/objc_zombie.h"
60 #include "components/breakpad/app/breakpad_mac.h" 60 #include "components/crash/app/breakpad_mac.h"
61 #include "ui/base/l10n/l10n_util_mac.h" 61 #include "ui/base/l10n/l10n_util_mac.h"
62 #endif 62 #endif
63 63
64 #if defined(OS_POSIX) 64 #if defined(OS_POSIX)
65 #include <locale.h> 65 #include <locale.h>
66 #include <signal.h> 66 #include <signal.h>
67 #include "chrome/app/chrome_breakpad_client.h" 67 #include "chrome/app/chrome_breakpad_client.h"
68 #include "components/breakpad/app/breakpad_client.h" 68 #include "components/crash/app/breakpad_client.h"
69 #endif 69 #endif
70 70
71 #if !defined(DISABLE_NACL) && defined(OS_LINUX) 71 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
72 #include "components/nacl/common/nacl_paths.h" 72 #include "components/nacl/common/nacl_paths.h"
73 #include "components/nacl/zygote/nacl_fork_delegate_linux.h" 73 #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
74 #endif 74 #endif
75 75
76 #if defined(OS_CHROMEOS) 76 #if defined(OS_CHROMEOS)
77 #include "base/sys_info.h" 77 #include "base/sys_info.h"
78 #include "chrome/browser/chromeos/boot_times_loader.h" 78 #include "chrome/browser/chromeos/boot_times_loader.h"
79 #include "chromeos/chromeos_paths.h" 79 #include "chromeos/chromeos_paths.h"
80 #include "chromeos/chromeos_switches.h" 80 #include "chromeos/chromeos_switches.h"
81 #endif 81 #endif
82 82
83 #if defined(OS_ANDROID) 83 #if defined(OS_ANDROID)
84 #include "chrome/common/descriptors_android.h" 84 #include "chrome/common/descriptors_android.h"
85 #else 85 #else
86 // Diagnostics is only available on non-android platforms. 86 // Diagnostics is only available on non-android platforms.
87 #include "chrome/browser/diagnostics/diagnostics_controller.h" 87 #include "chrome/browser/diagnostics/diagnostics_controller.h"
88 #include "chrome/browser/diagnostics/diagnostics_writer.h" 88 #include "chrome/browser/diagnostics/diagnostics_writer.h"
89 #endif 89 #endif
90 90
91 #if defined(USE_X11) 91 #if defined(USE_X11)
92 #include <stdlib.h> 92 #include <stdlib.h>
93 #include <string.h> 93 #include <string.h>
94 #include "ui/base/x/x11_util.h" 94 #include "ui/base/x/x11_util.h"
95 #endif 95 #endif
96 96
97 #if defined(OS_POSIX) && !defined(OS_MACOSX) 97 #if defined(OS_POSIX) && !defined(OS_MACOSX)
98 #include "components/breakpad/app/breakpad_linux.h" 98 #include "components/crash/app/breakpad_linux.h"
99 #endif 99 #endif
100 100
101 #if defined(OS_LINUX) 101 #if defined(OS_LINUX)
102 #include "base/environment.h" 102 #include "base/environment.h"
103 #endif 103 #endif
104 104
105 #if defined(OS_MACOSX) || defined(OS_WIN) 105 #if defined(OS_MACOSX) || defined(OS_WIN)
106 #include "chrome/browser/policy/policy_path_parser.h" 106 #include "chrome/browser/policy/policy_path_parser.h"
107 #endif 107 #endif
108 108
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 } 922 }
923 923
924 content::ContentUtilityClient* 924 content::ContentUtilityClient*
925 ChromeMainDelegate::CreateContentUtilityClient() { 925 ChromeMainDelegate::CreateContentUtilityClient() {
926 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 926 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
927 return NULL; 927 return NULL;
928 #else 928 #else
929 return g_chrome_content_utility_client.Pointer(); 929 return g_chrome_content_utility_client.Pointer();
930 #endif 930 #endif
931 } 931 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_breakpad_client.h ('k') | chrome/app/client_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698