| Index: content/app/content_main.cc
|
| diff --git a/content/app/content_main.cc b/content/app/content_main.cc
|
| index 9906cdfb5d0c30d8581204150b535ad8c2a80a24..558bcf3aa0f5cfe421c5a55b28d9842b2944cfbe 100644
|
| --- a/content/app/content_main.cc
|
| +++ b/content/app/content_main.cc
|
| @@ -22,12 +22,14 @@
|
| #include "content/common/sandbox_init_wrapper.h"
|
| #include "content/common/set_process_title.h"
|
| #include "content/public/app/content_main_delegate.h"
|
| +#include "content/public/common/content_client.h"
|
| #include "content/public/common/content_paths.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "crypto/nss_util.h"
|
| #include "ipc/ipc_switches.h"
|
| #include "ui/base/ui_base_switches.h"
|
| #include "ui/base/ui_base_paths.h"
|
| +#include "webkit/glue/webkit_glue.h"
|
|
|
| #if defined(OS_WIN)
|
| #include <atlbase.h>
|
| @@ -203,6 +205,13 @@ int RunZygote(const MainFunctionParams& main_function_params,
|
| // line so update it here with the new version.
|
| const CommandLine& command_line = *CommandLine::ForCurrentProcess();
|
|
|
| + // If a custom user agent was passed on the command line, we need
|
| + // to (re)set it now, rather than using the default one the zygote
|
| + // initialized.
|
| + bool custom = false;
|
| + std::string ua = content::GetContentClient()->GetUserAgent(&custom);
|
| + if (custom) webkit_glue::SetUserAgent(ua, custom);
|
| +
|
| // The StatsTable must be initialized in each process; we already
|
| // initialized for the browser process, now we need to initialize
|
| // within the new processes as well.
|
|
|