Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(749)

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 1123433003: New command line flag to disable AppContainer restrictions for renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698