Index: chrome/app/chrome_main_delegate.cc |
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc |
index e4fa69afd1d1bb9270ed1a9bc6beca0c7797c2a7..bec26d6c49ce8a1e405e88b8cc0d48eb970b9499 100644 |
--- a/chrome/app/chrome_main_delegate.cc |
+++ b/chrome/app/chrome_main_delegate.cc |
@@ -40,6 +40,7 @@ |
#include "chrome/common/switch_utils.h" |
#include "chrome/common/trace_event_args_whitelist.h" |
#include "chrome/common/url_constants.h" |
+#include "chrome/gpu/chrome_content_gpu_client.h" |
#include "chrome/plugin/chrome_content_plugin_client.h" |
#include "chrome/renderer/chrome_content_renderer_client.h" |
#include "chrome/utility/chrome_content_utility_client.h" |
@@ -141,6 +142,8 @@ |
#if !defined(CHROME_MULTIPLE_DLL_BROWSER) |
#include "chrome/child/pdf_child_init.h" |
+base::LazyInstance<ChromeContentGpuClient> g_chrome_content_gpu_client = |
+ LAZY_INSTANCE_INITIALIZER; |
base::LazyInstance<ChromeContentRendererClient> |
g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; |
base::LazyInstance<ChromeContentUtilityClient> |
@@ -984,6 +987,14 @@ ChromeMainDelegate::CreateContentBrowserClient() { |
#endif |
} |
+content::ContentGpuClient* ChromeMainDelegate::CreateContentGpuClient() { |
+#if defined(CHROME_MULTIPLE_DLL_CHILD) |
+ return NULL; |
dcheng
2016/03/24 20:29:14
nullptr
kcwu
2016/03/28 13:17:34
Done.
|
+#else |
+ return g_chrome_content_gpu_client.Pointer(); |
+#endif |
+} |
+ |
content::ContentPluginClient* ChromeMainDelegate::CreateContentPluginClient() { |
#if defined(CHROME_MULTIPLE_DLL_BROWSER) |
return NULL; |