Chromium Code Reviews| Index: content/ppapi_plugin/ppapi_thread.cc |
| diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc |
| index 5ed1873cce87364ef7a0aeb231b58a3bebd2cf44..5be5646ea6e3348414632c2f707ccb0fb1dfe902 100644 |
| --- a/content/ppapi_plugin/ppapi_thread.cc |
| +++ b/content/ppapi_plugin/ppapi_thread.cc |
| @@ -52,6 +52,11 @@ |
| #if defined(OS_WIN) |
| extern sandbox::TargetServices* g_target_services; |
| + |
| +// Used by EnumSystemLocales for warming up |
|
yzshen1
2014/01/17 17:36:11
Please put a trailing '.' at the end of the commen
|
| +static BOOL CALLBACK EnumLocalesProc(LPTSTR lpLocaleString) { |
| + return TRUE; |
| +} |
| #else |
| extern void* g_target_services; |
| #endif |
| @@ -297,6 +302,11 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path, |
| ::GetUserDefaultLangID(); |
| ::GetUserDefaultLCID(); |
| + if (permissions.HasPermission(ppapi::PERMISSION_FLASH)) { |
| + // Warm up system locales. |
| + EnumSystemLocalesW(EnumLocalesProc, LCID_INSTALLED); |
| + } |
| + |
| g_target_services->LowerToken(); |
| } |
| #endif |