| Index: content/browser/renderer_host/render_process_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
| index 46528409462250a7c89c8f1c7a44996c9d8ce12a..dbaadb76dc72f56dd6f964fc63823f2c94a8ea5a 100644
|
| --- a/content/browser/renderer_host/render_process_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_process_host_impl.cc
|
| @@ -339,16 +339,20 @@ class RendererSandboxedProcessLauncherDelegate
|
|
|
| if (base::win::GetVersion() == base::win::VERSION_WIN8 ||
|
| base::win::GetVersion() == base::win::VERSION_WIN8_1) {
|
| - // TODO(shrikant): Check if these constants should be different across
|
| - // various versions of Chromium code base or could be same.
|
| - // If there should be different SID per channel then move this code
|
| - // in chrome rather than content and assign SID based on
|
| - // VersionInfo::GetChannel().
|
| - const wchar_t kAppContainerSid[] =
|
| - L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
|
| - L"924012148-129201922";
|
| -
|
| - policy->SetLowBox(kAppContainerSid);
|
| + const base::CommandLine& command_line =
|
| + *base::CommandLine::ForCurrentProcess();
|
| + if (!command_line.HasSwitch(switches::kDisableAppContainer)) {
|
| + // TODO(shrikant): Check if these constants should be different across
|
| + // various versions of Chromium code base or could be same.
|
| + // If there should be different SID per channel then move this code
|
| + // in chrome rather than content and assign SID based on
|
| + // VersionInfo::GetChannel().
|
| + const wchar_t kAppContainerSid[] =
|
| + L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
|
| + L"924012148-129201922";
|
| +
|
| + policy->SetLowBox(kAppContainerSid);
|
| + }
|
| }
|
|
|
| GetContentClient()->browser()->PreSpawnRenderer(policy, success);
|
|
|