Chromium Code Reviews| Index: chrome/common/chrome_content_client.cc |
| diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc |
| index 65b004b3ede042d7c5f9f3ceb30305b025eaa03f..0433b7fe38c9eebeb44a45d5c112f18725633bb5 100644 |
| --- a/chrome/common/chrome_content_client.cc |
| +++ b/chrome/common/chrome_content_client.cc |
| @@ -21,6 +21,7 @@ |
| #include "chrome/common/render_messages.h" |
| #include "chrome/default_plugin/plugin_main.h" |
| #include "content/public/common/pepper_plugin_info.h" |
| +#include "grit/common_resources.h" |
| #include "remoting/client/plugin/pepper_entrypoints.h" |
| #include "ui/base/l10n/l10n_util.h" |
| #include "ui/base/resource/resource_bundle.h" |
| @@ -30,6 +31,8 @@ |
| #if defined(OS_WIN) |
| #include "sandbox/src/sandbox.h" |
| +#elif defined(OS_MACOSX) |
| +#include "chrome/common/chrome_sandbox_process_type_mac.h" |
| #endif |
| namespace { |
| @@ -403,4 +406,13 @@ bool ChromeContentClient::SandboxPlugin(CommandLine* command_line, |
| } |
| #endif |
| +#if defined(OS_MACOSX) |
| +int ChromeContentClient::GetSandboxPolicyForSandboxType( |
|
jeremy
2011/11/24 12:20:19
Policy -> Profile here and in the enum.
jochen (gone - plz use gerrit)
2011/11/24 16:23:22
Done.
|
| + int sandbox_type) const { |
| + if (sandbox_type == CHROME_SANDBOX_PROCESS_TYPE_NACL_LOADER) |
| + return IDR_NACL_SANDBOX_POLICY; |
| + return -1; |
| +} |
| +#endif |
| + |
| } // namespace chrome |