diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 17:50:51 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-09 17:50:51 +0000 |
| commit | 74e50c0cc9c4f0ba3301ae678c0939e3628b8e7b (patch) | |
| tree | ba59354b161fb545a980f009f62f0366e4bd27e0 /content/app | |
| parent | 91800dec3b3d1c95ef3cc9619b59db1243f74805 (diff) | |
| download | chromium_src-74e50c0cc9c4f0ba3301ae678c0939e3628b8e7b.zip chromium_src-74e50c0cc9c4f0ba3301ae678c0939e3628b8e7b.tar.gz chromium_src-74e50c0cc9c4f0ba3301ae678c0939e3628b8e7b.tar.bz2 | |
Simplify the user agent code some more since after r255534 it's not affected by the site's URL.
Code in content always gets it now from ContentClient::GetUserAgent. In Chrome, there's a GetUserAgent function which returns it.
BUG=338338
R=isherman@chromium.org, pauljensen@chromium.org, scottmg@chromium.org, tfarina@chromium.org
Review URL: https://codereview.chromium.org/191093002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/content_main_runner.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 94c1b9f..99d0818 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -50,7 +50,6 @@ #include "ui/base/ui_base_paths.h" #include "ui/base/ui_base_switches.h" #include "ui/gfx/win/dpi.h" -#include "webkit/common/user_agent/user_agent.h" #if defined(USE_TCMALLOC) #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" @@ -379,14 +378,6 @@ int RunZygote(const MainFunctionParams& main_function_params, command_line.GetSwitchValueASCII(switches::kProcessType); ContentClientInitializer::Set(process_type, delegate); - // 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. - if (command_line.HasSwitch(switches::kUserAgent)) { - webkit_glue::SetUserAgent( - command_line.GetSwitchValueASCII(switches::kUserAgent)); - } - // 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. @@ -741,14 +732,6 @@ class ContentMainRunnerImpl : public ContentMainRunner { if (delegate) delegate->PreSandboxStartup(); - // Set any custom user agent passed on the command line now so the string - // doesn't change between calls to webkit_glue::GetUserAgent(), otherwise it - // defaults to the user agent set during SetContentClient(). - if (command_line.HasSwitch(switches::kUserAgent)) { - webkit_glue::SetUserAgent( - command_line.GetSwitchValueASCII(switches::kUserAgent)); - } - if (!process_type.empty()) CommonSubprocessInit(process_type); |