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 12 matching lines...) Expand all Loading... |
23 #include "chrome/common/chrome_paths_internal.h" | 23 #include "chrome/common/chrome_paths_internal.h" |
24 #include "chrome/common/chrome_switches.h" | 24 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/common/chrome_version_info.h" | 25 #include "chrome/common/chrome_version_info.h" |
26 #include "chrome/common/logging_chrome.h" | 26 #include "chrome/common/logging_chrome.h" |
27 #include "chrome/common/profiling.h" | 27 #include "chrome/common/profiling.h" |
28 #include "chrome/common/url_constants.h" | 28 #include "chrome/common/url_constants.h" |
29 #include "chrome/plugin/chrome_content_plugin_client.h" | 29 #include "chrome/plugin/chrome_content_plugin_client.h" |
30 #include "chrome/renderer/chrome_content_renderer_client.h" | 30 #include "chrome/renderer/chrome_content_renderer_client.h" |
31 #include "chrome/utility/chrome_content_utility_client.h" | 31 #include "chrome/utility/chrome_content_utility_client.h" |
32 #include "content/app/content_main.h" | 32 #include "content/app/content_main.h" |
33 #include "content/app/content_main_delegate.h" | |
34 #include "content/browser/renderer_host/render_process_host.h" | 33 #include "content/browser/renderer_host/render_process_host.h" |
35 #include "content/common/content_counters.h" | 34 #include "content/common/content_counters.h" |
36 #include "content/common/content_paths.h" | 35 #include "content/common/content_paths.h" |
| 36 #include "content/public/app/content_main_delegate.h" |
37 #include "content/public/common/content_client.h" | 37 #include "content/public/common/content_client.h" |
38 #include "content/public/common/content_switches.h" | 38 #include "content/public/common/content_switches.h" |
39 #include "media/base/media.h" | 39 #include "media/base/media.h" |
40 #include "ui/base/resource/resource_bundle.h" | 40 #include "ui/base/resource/resource_bundle.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 <algorithm> | 44 #include <algorithm> |
45 #include <atlbase.h> | 45 #include <atlbase.h> |
46 #include <malloc.h> | 46 #include <malloc.h> |
(...skipping 684 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 |