| OLD | NEW |
| 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 26 matching lines...) Expand all Loading... |
| 37 #include "components/component_updater/component_updater_paths.h" | 37 #include "components/component_updater/component_updater_paths.h" |
| 38 #include "components/startup_metric_utils/startup_metric_utils.h" | 38 #include "components/startup_metric_utils/startup_metric_utils.h" |
| 39 #include "content/public/common/content_client.h" | 39 #include "content/public/common/content_client.h" |
| 40 #include "content/public/common/content_paths.h" | 40 #include "content/public/common/content_paths.h" |
| 41 #include "ui/base/ui_base_switches.h" | 41 #include "ui/base/ui_base_switches.h" |
| 42 | 42 |
| 43 #if defined(OS_WIN) | 43 #if defined(OS_WIN) |
| 44 #include <atlbase.h> | 44 #include <atlbase.h> |
| 45 #include <malloc.h> | 45 #include <malloc.h> |
| 46 #include <algorithm> | 46 #include <algorithm> |
| 47 #include "base/strings/string_util.h" | |
| 48 #include "chrome/common/child_process_logging.h" | 47 #include "chrome/common/child_process_logging.h" |
| 49 #include "chrome/common/terminate_on_heap_corruption_experiment_win.h" | 48 #include "chrome/common/terminate_on_heap_corruption_experiment_win.h" |
| 50 #include "sandbox/win/src/sandbox.h" | 49 #include "sandbox/win/src/sandbox.h" |
| 51 #include "ui/base/resource/resource_bundle_win.h" | 50 #include "ui/base/resource/resource_bundle_win.h" |
| 52 #endif | 51 #endif |
| 53 | 52 |
| 54 #if defined(OS_MACOSX) | 53 #if defined(OS_MACOSX) |
| 55 #include "base/mac/mac_util.h" | 54 #include "base/mac/mac_util.h" |
| 56 #include "base/mac/os_crash_dumps.h" | 55 #include "base/mac/os_crash_dumps.h" |
| 57 #include "chrome/app/chrome_main_mac.h" | 56 #include "chrome/app/chrome_main_mac.h" |
| 58 #include "chrome/browser/mac/relauncher.h" | 57 #include "chrome/browser/mac/relauncher.h" |
| 59 #include "chrome/common/chrome_paths_internal.h" | |
| 60 #include "chrome/common/mac/cfbundle_blocker.h" | 58 #include "chrome/common/mac/cfbundle_blocker.h" |
| 61 #include "chrome/common/mac/objc_zombie.h" | 59 #include "chrome/common/mac/objc_zombie.h" |
| 62 #include "components/breakpad/app/breakpad_mac.h" | 60 #include "components/breakpad/app/breakpad_mac.h" |
| 63 #include "grit/chromium_strings.h" | |
| 64 #include "ui/base/l10n/l10n_util_mac.h" | 61 #include "ui/base/l10n/l10n_util_mac.h" |
| 65 #endif | 62 #endif |
| 66 | 63 |
| 67 #if defined(OS_POSIX) | 64 #if defined(OS_POSIX) |
| 68 #include <locale.h> | 65 #include <locale.h> |
| 69 #include <signal.h> | 66 #include <signal.h> |
| 70 #include "chrome/app/chrome_breakpad_client.h" | 67 #include "chrome/app/chrome_breakpad_client.h" |
| 71 #include "components/breakpad/app/breakpad_client.h" | 68 #include "components/breakpad/app/breakpad_client.h" |
| 72 #endif | 69 #endif |
| 73 | 70 |
| (...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 928 } | 925 } |
| 929 | 926 |
| 930 content::ContentUtilityClient* | 927 content::ContentUtilityClient* |
| 931 ChromeMainDelegate::CreateContentUtilityClient() { | 928 ChromeMainDelegate::CreateContentUtilityClient() { |
| 932 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 929 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 933 return NULL; | 930 return NULL; |
| 934 #else | 931 #else |
| 935 return g_chrome_content_utility_client.Pointer(); | 932 return g_chrome_content_utility_client.Pointer(); |
| 936 #endif | 933 #endif |
| 937 } | 934 } |
| OLD | NEW |