OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 #include <stdlib.h> | 90 #include <stdlib.h> |
91 #include <string.h> | 91 #include <string.h> |
92 #include "ui/base/x/x11_util.h" | 92 #include "ui/base/x/x11_util.h" |
93 #endif | 93 #endif |
94 | 94 |
95 #if defined(USE_LINUX_BREAKPAD) | 95 #if defined(USE_LINUX_BREAKPAD) |
96 #include "chrome/app/breakpad_linux.h" | 96 #include "chrome/app/breakpad_linux.h" |
97 #endif | 97 #endif |
98 | 98 |
99 base::LazyInstance<chrome::ChromeContentBrowserClient> | 99 base::LazyInstance<chrome::ChromeContentBrowserClient> |
100 g_chrome_content_browser_client(base::LINKER_INITIALIZED); | 100 g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; |
101 base::LazyInstance<chrome::ChromeContentRendererClient> | 101 base::LazyInstance<chrome::ChromeContentRendererClient> |
102 g_chrome_content_renderer_client(base::LINKER_INITIALIZED); | 102 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; |
103 base::LazyInstance<chrome::ChromeContentUtilityClient> | 103 base::LazyInstance<chrome::ChromeContentUtilityClient> |
104 g_chrome_content_utility_client(base::LINKER_INITIALIZED); | 104 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER; |
105 base::LazyInstance<chrome::ChromeContentPluginClient> | 105 base::LazyInstance<chrome::ChromeContentPluginClient> |
106 g_chrome_content_plugin_client(base::LINKER_INITIALIZED); | 106 g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; |
107 | 107 |
108 extern int NaClMain(const content::MainFunctionParams&); | 108 extern int NaClMain(const content::MainFunctionParams&); |
109 extern int ServiceProcessMain(const content::MainFunctionParams&); | 109 extern int ServiceProcessMain(const content::MainFunctionParams&); |
110 | 110 |
111 namespace { | 111 namespace { |
112 | 112 |
113 #if defined(OS_WIN) | 113 #if defined(OS_WIN) |
114 const wchar_t kProfilingDll[] = L"memory_watcher.dll"; | 114 const wchar_t kProfilingDll[] = L"memory_watcher.dll"; |
115 | 115 |
116 // Load the memory profiling DLL. All it needs to be activated | 116 // Load the memory profiling DLL. All it needs to be activated |
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
731 | 731 |
732 #if defined(USE_LINUX_BREAKPAD) | 732 #if defined(USE_LINUX_BREAKPAD) |
733 // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets | 733 // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets |
734 // this up for the browser process in a different manner. | 734 // this up for the browser process in a different manner. |
735 InitCrashReporter(); | 735 InitCrashReporter(); |
736 #endif | 736 #endif |
737 | 737 |
738 InitializeChromeContentClient(process_type); | 738 InitializeChromeContentClient(process_type); |
739 } | 739 } |
740 #endif // OS_MACOSX | 740 #endif // OS_MACOSX |
OLD | NEW |