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

Unified Diff: chrome/common/chrome_content_client.cc

Issue 8589001: Load mac sandbox definitions from resources instead of the bundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 9 years, 1 month 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 | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_sandbox_type_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 9c8ca65be98732bf3f0059889000588817fa84ff..da07553e0035a9963a9ae744510393aca1742108 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_type_mac.h"
#endif
namespace {
@@ -399,4 +402,17 @@ bool ChromeContentClient::SandboxPlugin(CommandLine* command_line,
}
#endif
+#if defined(OS_MACOSX)
+bool ChromeContentClient::GetSandboxProfileForSandboxType(
+ int sandbox_type,
+ int* sandbox_profile_resource_id) const {
+ DCHECK(sandbox_profile_resource_id);
+ if (sandbox_type == CHROME_SANDBOX_TYPE_NACL_LOADER) {
+ *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
+ return true;
+ }
+ return false;
+}
+#endif
+
} // namespace chrome
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_sandbox_type_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698