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

Unified Diff: mojo/shell/application_manager.cc

Issue 1318103003: mandoline: Obey --no-sandbox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix collision with content. Created 5 years, 4 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 | mojo/shell/switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/application_manager.cc
diff --git a/mojo/shell/application_manager.cc b/mojo/shell/application_manager.cc
index e119c4d3aebc8143d3952bc8dd2c4b1a937ebd7c..782163c9a4c8814291190669bb41e3664e47953e 100644
--- a/mojo/shell/application_manager.cc
+++ b/mojo/shell/application_manager.cc
@@ -382,10 +382,13 @@ void ApplicationManager::HandleFetchCallback(
// TODO(erg): Have a better way of switching the sandbox on. For now, switch
// it on hard coded when we're using some of the sandboxable core services.
bool start_sandboxed = false;
- if (app_url == GURL("mojo://core_services/") && qualifier == "Core")
- start_sandboxed = true;
- else if (app_url == GURL("mojo://html_viewer/"))
- start_sandboxed = true;
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kMojoNoSandbox)) {
+ if (app_url == GURL("mojo://core_services/") && qualifier == "Core")
+ start_sandboxed = true;
+ else if (app_url == GURL("mojo://html_viewer/"))
+ start_sandboxed = true;
+ }
fetcher->AsPath(blocking_pool_,
base::Bind(&ApplicationManager::RunNativeApplication,
« no previous file with comments | « no previous file | mojo/shell/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698