From b97c22d4d768b557f6c601e7ef89b4bb9ab6a41a Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 1 Jun 2015 12:53:43 +0800 Subject: [PATCH] win: Load pdf.dll with abosolute path, fix #1826 --- chromium_src/chrome/utility/printing_handler_win.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/chromium_src/chrome/utility/printing_handler_win.cc b/chromium_src/chrome/utility/printing_handler_win.cc index 705131f348cd..ec908d19fc51 100644 --- a/chromium_src/chrome/utility/printing_handler_win.cc +++ b/chromium_src/chrome/utility/printing_handler_win.cc @@ -31,8 +31,11 @@ class PdfFunctions { render_pdf_to_dc_func_(NULL) {} bool Init() { - base::FilePath pdf_module_path(FILE_PATH_LITERAL("pdf.dll")); - pdf_lib_.Reset(base::LoadNativeLibrary(pdf_module_path, NULL)); + base::FilePath module_path; + if (!PathService::Get(base::DIR_MODULE, &module_path)) + return false; + base::FilePath::StringType name(FILE_PATH_LITERAL("pdf.dll")); + pdf_lib_.Reset(base::LoadNativeLibrary(module_path.Append(name), NULL)); if (!pdf_lib_.is_valid()) { LOG(WARNING) << "Couldn't load PDF plugin"; return false;