Chromium Code Reviews| Index: content/app/content_main.cc |
| diff --git a/content/app/content_main.cc b/content/app/content_main.cc |
| index 82a013639a5de6fc4234d9f3c8b7a149af571962..5a03085af7f1ff8c902d2cf65cdd5808d96f4a57 100644 |
| --- a/content/app/content_main.cc |
| +++ b/content/app/content_main.cc |
| @@ -141,7 +141,8 @@ void CommonSubprocessInit(const std::string& process_type) { |
| MSG msg; |
| PeekMessage(&msg, NULL, 0, 0, PM_REMOVE); |
| #endif |
| -#if defined(OS_POSIX) && !defined(OS_MACOSX) |
| +#if defined(OS_POSIX) && !defined(OS_MACOSX) && \ |
| + !defined(OS_LINUX) && !defined(OS_ANDROID) |
|
jam
2012/01/23 05:11:56
curious: why not do this now for linux?
John Grabowski
2012/01/25 20:29:15
That shouldn't be in there; removed.
|
| // Various things break when you're using a locale where the decimal |
| // separator isn't a period. See e.g. bugs 22782 and 39964. For |
| // all processes except the browser process (where we call system |
| @@ -308,9 +309,11 @@ int ContentMain(int argc, |
| tc_set_new_mode(1); |
| #endif |
| +#if !defined(OS_ANDROID) |
| // Set C library locale to make sure CommandLine can parse argument values |
| // in correct encoding. |
| setlocale(LC_ALL, ""); |
| +#endif |
| SetupSignalHandlers(); |