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, |