Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4056)

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 897563002: Unify the three places that patch font loading for PDFium on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index e62085da5869fed55de57fb4d9c8bbb4d3cf508a..608d513c19c4680b54fb35188c277c32a8432739 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -119,12 +119,9 @@
#include "remoting/client/plugin/pepper_entrypoints.h"
#endif
-#if !defined(CHROME_MULTIPLE_DLL_CHILD)
-base::LazyInstance<chrome::ChromeContentBrowserClient>
- g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
-#endif
-
#if !defined(CHROME_MULTIPLE_DLL_BROWSER)
+#include "chrome/child/pdf_child_init.h"
+
base::LazyInstance<ChromeContentRendererClient>
g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
base::LazyInstance<ChromeContentUtilityClient>
@@ -133,6 +130,11 @@ base::LazyInstance<chrome::ChromeContentPluginClient>
g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
#endif
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
+base::LazyInstance<chrome::ChromeContentBrowserClient>
+ g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
+#endif
+
#if defined(OS_POSIX)
base::LazyInstance<chrome::ChromeCrashReporterClient>::Leaky
g_chrome_crash_client = LAZY_INSTANCE_INITIALIZER;
@@ -775,6 +777,8 @@ void ChromeMainDelegate::PreSandboxStartup() {
process_type == switches::kZygoteProcess) {
ChromeContentUtilityClient::PreSandboxStartup();
}
+
+ chrome::InitializePDF();
#endif
}
« no previous file with comments | « chrome/app/DEPS ('k') | chrome/child/BUILD.gn » ('j') | chrome/utility/printing_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698