Commit 4534b8c7 authored by levin@chromium.org's avatar levin@chromium.org

Initialize the resource bundle now that it is used due to http://trac.webkit.org/changeset/93879.

TEST=SharedWorker ui tests all crash on OSX after the WebKit roll without this.

Review URL: http://codereview.chromium.org/7777004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98595 0039d316-1c4b-4281-b951-d872f2087c98
parent 14e087bc
...@@ -322,6 +322,10 @@ bool SubprocessNeedsResourceBundle(const std::string& process_type) { ...@@ -322,6 +322,10 @@ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
#if defined(OS_POSIX) && !defined(OS_MACOSX) #if defined(OS_POSIX) && !defined(OS_MACOSX)
// The zygote process opens the resources for the renderers. // The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess || process_type == switches::kZygoteProcess ||
#endif
#if defined(OS_MACOSX)
// Mac needs them to for scrollbar related images.
process_type == switches::kWorkerProcess ||
#endif #endif
process_type == switches::kRendererProcess || process_type == switches::kRendererProcess ||
process_type == switches::kExtensionProcess || process_type == switches::kExtensionProcess ||
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "net/base/mime_util.h" #include "net/base/mime_util.h"
#include "ipc/ipc_switches.h" #include "ipc/ipc_switches.h"
#include "net/base/registry_controlled_domain.h" #include "net/base/registry_controlled_domain.h"
#include "ui/base/ui_base_switches.h"
#include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_context.h"
#include "webkit/fileapi/file_system_path_manager.h" #include "webkit/fileapi/file_system_path_manager.h"
#include "webkit/fileapi/sandbox_mount_point_provider.h" #include "webkit/fileapi/sandbox_mount_point_provider.h"
...@@ -131,6 +132,9 @@ bool WorkerProcessHost::Init(int render_process_id) { ...@@ -131,6 +132,9 @@ bool WorkerProcessHost::Init(int render_process_id) {
CommandLine* cmd_line = new CommandLine(exe_path); CommandLine* cmd_line = new CommandLine(exe_path);
cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kWorkerProcess); cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kWorkerProcess);
cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id()); cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id());
std::string locale =
content::GetContentClient()->browser()->GetApplicationLocale();
cmd_line->AppendSwitchASCII(switches::kLang, locale);
static const char* const kSwitchNames[] = { static const char* const kSwitchNames[] = {
switches::kWebWorkerShareProcesses, switches::kWebWorkerShareProcesses,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment