OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/ppapi_plugin_process_host.h" | 5 #include "content/browser/ppapi_plugin_process_host.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
90 return false; | 90 return false; |
91 | 91 |
92 content::ContentBrowserClient* browser_client = | 92 content::ContentBrowserClient* browser_client = |
93 GetContentClient()->browser(); | 93 GetContentClient()->browser(); |
94 | 94 |
95 #if !defined(NACL_WIN64) | 95 #if !defined(NACL_WIN64) |
96 if (IsWin32kRendererLockdownEnabled()) { | 96 if (IsWin32kRendererLockdownEnabled()) { |
97 for (const auto& mime_type : info_.mime_types) { | 97 for (const auto& mime_type : info_.mime_types) { |
98 if (browser_client->IsWin32kLockdownEnabledForMimeType( | 98 if (browser_client->IsWin32kLockdownEnabledForMimeType( |
99 mime_type.mime_type)) { | 99 mime_type.mime_type)) { |
100 if (!AddWin32kLockdownPolicy(policy)) | 100 if (!AddWin32kLockdownPolicy(policy, true)) |
Will Harris
2016/04/26 17:18:26
might want to pull this into a separate CL, i.e. h
| |
101 return false; | 101 return false; |
102 break; | 102 break; |
103 } | 103 } |
104 } | 104 } |
105 } | 105 } |
106 #endif | 106 #endif |
107 const base::string16& sid = | 107 const base::string16& sid = |
108 browser_client->GetAppContainerSidForSandboxType(GetSandboxType()); | 108 browser_client->GetAppContainerSidForSandboxType(GetSandboxType()); |
109 if (!sid.empty()) | 109 if (!sid.empty()) |
110 AddAppContainerPolicy(policy, sid.c_str()); | 110 AddAppContainerPolicy(policy, sid.c_str()); |
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
546 // sent_requests_ queue should be the one that the plugin just created. | 546 // sent_requests_ queue should be the one that the plugin just created. |
547 Client* client = sent_requests_.front(); | 547 Client* client = sent_requests_.front(); |
548 sent_requests_.pop(); | 548 sent_requests_.pop(); |
549 | 549 |
550 const ChildProcessData& data = process_->GetData(); | 550 const ChildProcessData& data = process_->GetData(); |
551 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), | 551 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), |
552 data.id); | 552 data.id); |
553 } | 553 } |
554 | 554 |
555 } // namespace content | 555 } // namespace content |
OLD | NEW |