| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "extensions/common/constants.h" | 42 #include "extensions/common/constants.h" |
| 43 #include "ui/base/ui_base_switches.h" | 43 #include "ui/base/ui_base_switches.h" |
| 44 | 44 |
| 45 #if defined(OS_WIN) | 45 #if defined(OS_WIN) |
| 46 #include <atlbase.h> | 46 #include <atlbase.h> |
| 47 #include <malloc.h> | 47 #include <malloc.h> |
| 48 #include <algorithm> | 48 #include <algorithm> |
| 49 #include "chrome/app/close_handle_hook_win.h" | 49 #include "chrome/app/close_handle_hook_win.h" |
| 50 #include "chrome/common/child_process_logging.h" | 50 #include "chrome/common/child_process_logging.h" |
| 51 #include "chrome/common/terminate_on_heap_corruption_experiment_win.h" | 51 #include "chrome/common/terminate_on_heap_corruption_experiment_win.h" |
| 52 #include "chrome/common/v8_breakpad_support_win.h" |
| 52 #include "sandbox/win/src/sandbox.h" | 53 #include "sandbox/win/src/sandbox.h" |
| 53 #include "ui/base/resource/resource_bundle_win.h" | 54 #include "ui/base/resource/resource_bundle_win.h" |
| 54 #endif | 55 #endif |
| 55 | 56 |
| 56 #if defined(OS_MACOSX) | 57 #if defined(OS_MACOSX) |
| 57 #include "base/mac/mac_util.h" | 58 #include "base/mac/mac_util.h" |
| 58 #include "base/mac/os_crash_dumps.h" | 59 #include "base/mac/os_crash_dumps.h" |
| 59 #include "chrome/app/chrome_main_mac.h" | 60 #include "chrome/app/chrome_main_mac.h" |
| 60 #include "chrome/browser/mac/relauncher.h" | 61 #include "chrome/browser/mac/relauncher.h" |
| 61 #include "chrome/common/mac/cfbundle_blocker.h" | 62 #include "chrome/common/mac/cfbundle_blocker.h" |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 // there have more impact. | 396 // there have more impact. |
| 396 const bool is_browser = !command_line.HasSwitch(switches::kProcessType); | 397 const bool is_browser = !command_line.HasSwitch(switches::kProcessType); |
| 397 ObjcEvilDoers::ZombieEnable(true, is_browser ? 10000 : 1000); | 398 ObjcEvilDoers::ZombieEnable(true, is_browser ? 10000 : 1000); |
| 398 | 399 |
| 399 SetUpBundleOverrides(); | 400 SetUpBundleOverrides(); |
| 400 chrome::common::mac::EnableCFBundleBlocker(); | 401 chrome::common::mac::EnableCFBundleBlocker(); |
| 401 #endif | 402 #endif |
| 402 | 403 |
| 403 Profiling::ProcessStarted(); | 404 Profiling::ProcessStarted(); |
| 404 | 405 |
| 406 #if defined(OS_WIN) |
| 407 v8_breakpad_support::SetUp(); |
| 408 #endif |
| 409 |
| 405 #if defined(OS_POSIX) | 410 #if defined(OS_POSIX) |
| 406 if (HandleVersionSwitches(command_line)) { | 411 if (HandleVersionSwitches(command_line)) { |
| 407 *exit_code = 0; | 412 *exit_code = 0; |
| 408 return true; // Got a --version switch; exit with a success error code. | 413 return true; // Got a --version switch; exit with a success error code. |
| 409 } | 414 } |
| 410 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) | 415 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) |
| 411 // This will directly exit if the user asked for help. | 416 // This will directly exit if the user asked for help. |
| 412 HandleHelpSwitches(command_line); | 417 HandleHelpSwitches(command_line); |
| 413 #endif | 418 #endif |
| 414 #endif // OS_POSIX | 419 #endif // OS_POSIX |
| (...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 936 } | 941 } |
| 937 | 942 |
| 938 content::ContentUtilityClient* | 943 content::ContentUtilityClient* |
| 939 ChromeMainDelegate::CreateContentUtilityClient() { | 944 ChromeMainDelegate::CreateContentUtilityClient() { |
| 940 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 945 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 941 return NULL; | 946 return NULL; |
| 942 #else | 947 #else |
| 943 return g_chrome_content_utility_client.Pointer(); | 948 return g_chrome_content_utility_client.Pointer(); |
| 944 #endif | 949 #endif |
| 945 } | 950 } |
| OLD | NEW |