diff options
| author | wfh <wfh@chromium.org> | 2015-07-20 11:31:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-20 18:32:27 +0000 |
| commit | 5a24b7291445455f3f6550852c9c3eeb6f8725d6 (patch) | |
| tree | 6d79b4bfd8f13ff33f2411ef3adf14c0f5c1d6e5 | |
| parent | f88ed40b1fcfe230b73ddc61c180e9ac071cc222 (diff) | |
| download | chromium_src-5a24b7291445455f3f6550852c9c3eeb6f8725d6.zip chromium_src-5a24b7291445455f3f6550852c9c3eeb6f8725d6.tar.gz chromium_src-5a24b7291445455f3f6550852c9c3eeb6f8725d6.tar.bz2 | |
Add AppContainer to PPAPI processes.
BUG=499523
TEST=Make sure Flash and PDF both still work on Windows 8+
Review URL: https://codereview.chromium.org/1177923002
Cr-Commit-Position: refs/heads/master@{#339475}
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 2 | ||||
| -rw-r--r-- | content/browser/ppapi_plugin_process_host.cc | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index c750c07..36df8db 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -2373,7 +2373,7 @@ base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( case content::SANDBOX_TYPE_GPU: return base::string16(); case content::SANDBOX_TYPE_PPAPI: - return base::string16(); + return sid + L"129201925"; #if !defined(DISABLE_NACL) case PROCESS_TYPE_NACL_LOADER: return base::string16(); diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index b58c1d6..be819d6 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -66,6 +66,12 @@ class PpapiPluginSandboxedProcessLauncherDelegate sandbox::TargetPolicy::NAMEDPIPES_ALLOW_ANY, L"\\\\.\\pipe\\chrome.*"); *success = (result == sandbox::SBOX_ALL_OK); + + const base::string16& sid = + GetContentClient()->browser()->GetAppContainerSidForSandboxType( + GetSandboxType()); + if (!sid.empty()) + AddAppContainerPolicy(policy, sid.c_str()); } #elif defined(OS_POSIX) |