diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 23:56:51 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 23:56:51 +0000 |
| commit | 4287a3dba847dce805997314fcd560a5dadc1738 (patch) | |
| tree | bd69a1f4c802d5df31ac5fadeb13732984d63821 /content/browser/zygote_host_linux.cc | |
| parent | 7daebb52b22ca0e87f3b595beaa1d166a9002c5a (diff) | |
| download | chromium_src-4287a3dba847dce805997314fcd560a5dadc1738.zip chromium_src-4287a3dba847dce805997314fcd560a5dadc1738.tar.gz chromium_src-4287a3dba847dce805997314fcd560a5dadc1738.tar.bz2 | |
Remove content dependency on chrome/browser/accessibility/browser_accessibility_state.h and chrome/common/chrome_switches.h.
BUG=76697,85932
Review URL: http://codereview.chromium.org/7046114
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/zygote_host_linux.cc')
| -rw-r--r-- | content/browser/zygote_host_linux.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/content/browser/zygote_host_linux.cc b/content/browser/zygote_host_linux.cc index 0469a97..b3ab212 100644 --- a/content/browser/zygote_host_linux.cc +++ b/content/browser/zygote_host_linux.cc @@ -9,6 +9,7 @@ #include <sys/types.h> #include <unistd.h> +#include "base/base_switches.h" #include "base/command_line.h" #include "base/eintr_wrapper.h" #include "base/environment.h" @@ -22,8 +23,9 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/chrome_switches.h" +#include "content/browser/content_browser_client.h" #include "content/browser/renderer_host/render_sandbox_host_linux.h" +#include "content/common/content_switches.h" #include "content/common/process_watcher.h" #include "content/common/result_codes.h" #include "content/common/unix_domain_socket_posix.h" @@ -104,14 +106,8 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) { switches::kAllowSandboxDebugging, switches::kLoggingLevel, switches::kEnableLogging, // Support, e.g., --enable-logging=stderr. - switches::kEnableRemoting, switches::kV, switches::kVModule, - switches::kUserDataDir, // Make logs go to the right file. - // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. - switches::kPpapiFlashInProcess, - switches::kPpapiFlashPath, - switches::kPpapiFlashVersion, switches::kRegisterPepperPlugins, switches::kDisableSeccompSandbox, switches::kEnableSeccompSandbox, @@ -119,6 +115,9 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) { cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches, arraysize(kForwardSwitches)); + content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( + &cmd_line, -1); + sandbox_binary_ = sandbox_cmd.c_str(); struct stat st; |