| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 #include "chrome/common/chrome_paths_internal.h" | 33 #include "chrome/common/chrome_paths_internal.h" |
| 34 #include "chrome/common/chrome_result_codes.h" | 34 #include "chrome/common/chrome_result_codes.h" |
| 35 #include "chrome/common/chrome_switches.h" | 35 #include "chrome/common/chrome_switches.h" |
| 36 #include "chrome/common/crash_keys.h" | 36 #include "chrome/common/crash_keys.h" |
| 37 #include "chrome/common/features.h" | 37 #include "chrome/common/features.h" |
| 38 #include "chrome/common/logging_chrome.h" | 38 #include "chrome/common/logging_chrome.h" |
| 39 #include "chrome/common/profiling.h" | 39 #include "chrome/common/profiling.h" |
| 40 #include "chrome/common/switch_utils.h" | 40 #include "chrome/common/switch_utils.h" |
| 41 #include "chrome/common/trace_event_args_whitelist.h" | 41 #include "chrome/common/trace_event_args_whitelist.h" |
| 42 #include "chrome/common/url_constants.h" | 42 #include "chrome/common/url_constants.h" |
| 43 #include "chrome/gpu/chrome_content_gpu_client.h" |
| 43 #include "chrome/renderer/chrome_content_renderer_client.h" | 44 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 44 #include "chrome/utility/chrome_content_utility_client.h" | 45 #include "chrome/utility/chrome_content_utility_client.h" |
| 45 #include "components/component_updater/component_updater_paths.h" | 46 #include "components/component_updater/component_updater_paths.h" |
| 46 #include "components/content_settings/core/common/content_settings_pattern.h" | 47 #include "components/content_settings/core/common/content_settings_pattern.h" |
| 47 #include "components/crash/content/app/crash_reporter_client.h" | 48 #include "components/crash/content/app/crash_reporter_client.h" |
| 48 #include "components/version_info/version_info.h" | 49 #include "components/version_info/version_info.h" |
| 49 #include "content/public/common/content_client.h" | 50 #include "content/public/common/content_client.h" |
| 50 #include "content/public/common/content_paths.h" | 51 #include "content/public/common/content_paths.h" |
| 51 #include "content/public/common/content_switches.h" | 52 #include "content/public/common/content_switches.h" |
| 52 #include "extensions/common/constants.h" | 53 #include "extensions/common/constants.h" |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 #include "pdf/pdf.h" | 135 #include "pdf/pdf.h" |
| 135 #endif | 136 #endif |
| 136 | 137 |
| 137 #if !defined(CHROME_MULTIPLE_DLL_CHILD) | 138 #if !defined(CHROME_MULTIPLE_DLL_CHILD) |
| 138 #include "components/startup_metric_utils/browser/startup_metric_utils.h" | 139 #include "components/startup_metric_utils/browser/startup_metric_utils.h" |
| 139 #endif | 140 #endif |
| 140 | 141 |
| 141 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) | 142 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 142 #include "chrome/child/pdf_child_init.h" | 143 #include "chrome/child/pdf_child_init.h" |
| 143 | 144 |
| 145 base::LazyInstance<ChromeContentGpuClient> g_chrome_content_gpu_client = |
| 146 LAZY_INSTANCE_INITIALIZER; |
| 144 base::LazyInstance<ChromeContentRendererClient> | 147 base::LazyInstance<ChromeContentRendererClient> |
| 145 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; | 148 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; |
| 146 base::LazyInstance<ChromeContentUtilityClient> | 149 base::LazyInstance<ChromeContentUtilityClient> |
| 147 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER; | 150 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER; |
| 148 #endif | 151 #endif |
| 149 | 152 |
| 150 #if !defined(CHROME_MULTIPLE_DLL_CHILD) | 153 #if !defined(CHROME_MULTIPLE_DLL_CHILD) |
| 151 base::LazyInstance<ChromeContentBrowserClient> g_chrome_content_browser_client = | 154 base::LazyInstance<ChromeContentBrowserClient> g_chrome_content_browser_client = |
| 152 LAZY_INSTANCE_INITIALIZER; | 155 LAZY_INSTANCE_INITIALIZER; |
| 153 #endif | 156 #endif |
| (...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 970 | 973 |
| 971 content::ContentBrowserClient* | 974 content::ContentBrowserClient* |
| 972 ChromeMainDelegate::CreateContentBrowserClient() { | 975 ChromeMainDelegate::CreateContentBrowserClient() { |
| 973 #if defined(CHROME_MULTIPLE_DLL_CHILD) | 976 #if defined(CHROME_MULTIPLE_DLL_CHILD) |
| 974 return NULL; | 977 return NULL; |
| 975 #else | 978 #else |
| 976 return g_chrome_content_browser_client.Pointer(); | 979 return g_chrome_content_browser_client.Pointer(); |
| 977 #endif | 980 #endif |
| 978 } | 981 } |
| 979 | 982 |
| 983 content::ContentGpuClient* ChromeMainDelegate::CreateContentGpuClient() { |
| 984 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 985 return nullptr; |
| 986 #else |
| 987 return g_chrome_content_gpu_client.Pointer(); |
| 988 #endif |
| 989 } |
| 990 |
| 980 content::ContentRendererClient* | 991 content::ContentRendererClient* |
| 981 ChromeMainDelegate::CreateContentRendererClient() { | 992 ChromeMainDelegate::CreateContentRendererClient() { |
| 982 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 993 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 983 return NULL; | 994 return NULL; |
| 984 #else | 995 #else |
| 985 return g_chrome_content_renderer_client.Pointer(); | 996 return g_chrome_content_renderer_client.Pointer(); |
| 986 #endif | 997 #endif |
| 987 } | 998 } |
| 988 | 999 |
| 989 content::ContentUtilityClient* | 1000 content::ContentUtilityClient* |
| (...skipping 11 matching lines...) Expand all Loading... |
| 1001 case version_info::Channel::CANARY: | 1012 case version_info::Channel::CANARY: |
| 1002 return true; | 1013 return true; |
| 1003 case version_info::Channel::DEV: | 1014 case version_info::Channel::DEV: |
| 1004 case version_info::Channel::BETA: | 1015 case version_info::Channel::BETA: |
| 1005 case version_info::Channel::STABLE: | 1016 case version_info::Channel::STABLE: |
| 1006 default: | 1017 default: |
| 1007 // Don't enable instrumentation. | 1018 // Don't enable instrumentation. |
| 1008 return false; | 1019 return false; |
| 1009 } | 1020 } |
| 1010 } | 1021 } |
| OLD | NEW |