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/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/metrics/stats_counters.h" | 10 #include "base/metrics/stats_counters.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 #endif | 59 #endif |
60 | 60 |
61 #if defined(OS_POSIX) | 61 #if defined(OS_POSIX) |
62 #include <locale.h> | 62 #include <locale.h> |
63 #include <signal.h> | 63 #include <signal.h> |
64 #include "chrome/app/chrome_breakpad_client.h" | 64 #include "chrome/app/chrome_breakpad_client.h" |
65 #include "components/breakpad/breakpad_client.h" | 65 #include "components/breakpad/breakpad_client.h" |
66 #endif | 66 #endif |
67 | 67 |
68 #if !defined(DISABLE_NACL) && defined(OS_LINUX) | 68 #if !defined(DISABLE_NACL) && defined(OS_LINUX) |
69 #include "chrome/app/nacl_fork_delegate_linux.h" | |
70 #include "components/nacl/common/nacl_paths.h" | 69 #include "components/nacl/common/nacl_paths.h" |
| 70 #include "components/nacl/zygote/nacl_fork_delegate_linux.h" |
71 #endif | 71 #endif |
72 | 72 |
73 #if defined(OS_CHROMEOS) | 73 #if defined(OS_CHROMEOS) |
74 #include "base/sys_info.h" | 74 #include "base/sys_info.h" |
75 #include "chrome/browser/chromeos/boot_times_loader.h" | 75 #include "chrome/browser/chromeos/boot_times_loader.h" |
76 #include "chromeos/chromeos_paths.h" | 76 #include "chromeos/chromeos_paths.h" |
77 #endif | 77 #endif |
78 | 78 |
79 #if defined(OS_ANDROID) | 79 #if defined(OS_ANDROID) |
80 #include "chrome/common/descriptors_android.h" | 80 #include "chrome/common/descriptors_android.h" |
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
789 } | 789 } |
790 | 790 |
791 content::ContentUtilityClient* | 791 content::ContentUtilityClient* |
792 ChromeMainDelegate::CreateContentUtilityClient() { | 792 ChromeMainDelegate::CreateContentUtilityClient() { |
793 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 793 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
794 return NULL; | 794 return NULL; |
795 #else | 795 #else |
796 return &g_chrome_content_utility_client.Get(); | 796 return &g_chrome_content_utility_client.Get(); |
797 #endif | 797 #endif |
798 } | 798 } |
OLD | NEW |