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/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #if defined(OS_MACOSX) | 55 #if defined(OS_MACOSX) |
56 #include "base/mac/mac_util.h" | 56 #include "base/mac/mac_util.h" |
57 #include "base/mac/os_crash_dumps.h" | 57 #include "base/mac/os_crash_dumps.h" |
58 #include "chrome/app/breakpad_mac.h" | 58 #include "chrome/app/breakpad_mac.h" |
59 #include "chrome/app/chrome_main_mac.h" | 59 #include "chrome/app/chrome_main_mac.h" |
60 #include "chrome/browser/mac/relauncher.h" | 60 #include "chrome/browser/mac/relauncher.h" |
61 #include "chrome/common/chrome_paths_internal.h" | 61 #include "chrome/common/chrome_paths_internal.h" |
62 #include "chrome/common/mac/cfbundle_blocker.h" | 62 #include "chrome/common/mac/cfbundle_blocker.h" |
63 #include "chrome/common/mac/objc_zombie.h" | 63 #include "chrome/common/mac/objc_zombie.h" |
64 #include "grit/chromium_strings.h" | 64 #include "grit/chromium_strings.h" |
65 #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface
.h" | |
66 #include "ui/base/l10n/l10n_util_mac.h" | 65 #include "ui/base/l10n/l10n_util_mac.h" |
67 #endif | 66 #endif |
68 | 67 |
69 #if defined(OS_POSIX) | 68 #if defined(OS_POSIX) |
70 #include <locale.h> | 69 #include <locale.h> |
71 #include <signal.h> | 70 #include <signal.h> |
72 #endif | 71 #endif |
73 | 72 |
74 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 73 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
75 #include "chrome/app/nacl_fork_delegate_linux.h" | 74 #include "chrome/app/nacl_fork_delegate_linux.h" |
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 | 581 |
583 // Enable Message Loop related state asap. | 582 // Enable Message Loop related state asap. |
584 if (command_line.HasSwitch(switches::kMessageLoopHistogrammer)) | 583 if (command_line.HasSwitch(switches::kMessageLoopHistogrammer)) |
585 MessageLoop::EnableHistogrammer(true); | 584 MessageLoop::EnableHistogrammer(true); |
586 | 585 |
587 // Single-process is an unsupported and not fully tested mode, so | 586 // Single-process is an unsupported and not fully tested mode, so |
588 // don't enable it for official Chrome builds. | 587 // don't enable it for official Chrome builds. |
589 #if !defined(GOOGLE_CHROME_BUILD) | 588 #if !defined(GOOGLE_CHROME_BUILD) |
590 if (command_line.HasSwitch(switches::kSingleProcess)) { | 589 if (command_line.HasSwitch(switches::kSingleProcess)) { |
591 content::RenderProcessHost::set_run_renderer_in_process(true); | 590 content::RenderProcessHost::set_run_renderer_in_process(true); |
592 #if defined(OS_MACOSX) | |
593 // TODO(port-mac): This is from renderer_main_platform_delegate.cc. | |
594 // shess tried to refactor things appropriately, but it sprawled out | |
595 // of control because different platforms needed different styles of | |
596 // initialization. Try again once we understand the process | |
597 // architecture needed and where it should live. | |
598 InitWebCoreSystemInterface(); | |
599 #endif | |
600 | |
601 InitializeChromeContentRendererClient(); | 591 InitializeChromeContentRendererClient(); |
602 } | 592 } |
603 #endif // GOOGLE_CHROME_BUILD | 593 #endif // GOOGLE_CHROME_BUILD |
604 | 594 |
605 logging::OldFileDeletionState file_state = | 595 logging::OldFileDeletionState file_state = |
606 logging::APPEND_TO_OLD_LOG_FILE; | 596 logging::APPEND_TO_OLD_LOG_FILE; |
607 if (process_type.empty()) { | 597 if (process_type.empty()) { |
608 file_state = logging::DELETE_OLD_LOG_FILE; | 598 file_state = logging::DELETE_OLD_LOG_FILE; |
609 } | 599 } |
610 logging::InitChromeLogging(command_line, file_state); | 600 logging::InitChromeLogging(command_line, file_state); |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
756 | 746 |
757 #if defined(USE_LINUX_BREAKPAD) | 747 #if defined(USE_LINUX_BREAKPAD) |
758 // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets | 748 // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets |
759 // this up for the browser process in a different manner. | 749 // this up for the browser process in a different manner. |
760 InitCrashReporter(); | 750 InitCrashReporter(); |
761 #endif | 751 #endif |
762 | 752 |
763 InitializeChromeContentClient(process_type); | 753 InitializeChromeContentClient(process_type); |
764 } | 754 } |
765 #endif // OS_MACOSX | 755 #endif // OS_MACOSX |
OLD | NEW |