Win: Look for the chrome.pak file in the module (libcef.dll) directory to match the locale folder location (issue #374).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@314 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-10-12 10:54:21 +00:00
parent c366d798f3
commit 07e2c7d348

View File

@ -47,9 +47,10 @@ void InitializeDataPak(const std::string& locale) {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
#if defined(OS_WIN) #if defined(OS_WIN)
// Explicitly load chrome.pak on Windows. // Explicitly load chrome.pak on Windows. Use the module (libcef.dll)
// directory to match the location of the locale folder.
FilePath chrome_pack_path; FilePath chrome_pack_path;
PathService::Get(base::DIR_EXE, &chrome_pack_path); PathService::Get(base::DIR_MODULE, &chrome_pack_path);
chrome_pack_path = chrome_pack_path.AppendASCII("chrome.pak"); chrome_pack_path = chrome_pack_path.AppendASCII("chrome.pak");
if (file_util::PathExists(chrome_pack_path)) if (file_util::PathExists(chrome_pack_path))
ResourceBundle::AddDataPackToSharedInstance(chrome_pack_path); ResourceBundle::AddDataPackToSharedInstance(chrome_pack_path);