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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/chrome_content_client.cc

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Windows build fix Created 7 years, 6 months 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
« chrome/chrome_renderer.gypi ('K') | « chrome/common/all_messages.h ('k') | chrome/common/chrome_paths.h » ('j') | chrome/common/nacl_delegate.cc » ('J')
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 e60f06d5c7e8da4edf68a6f9579174a70a12fe6b..eaed5a9b72d1d33bd2f21104659c60d979e32ccc 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -46,7 +46,7 @@
#include "base/win/windows_version.h"
#include "sandbox/win/src/sandbox.h"
#elif defined(OS_MACOSX)
-#include "chrome/common/chrome_sandbox_type_mac.h"
+#include "components/nacl/common/nacl_sandbox_type_mac.h"
#endif
#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
@@ -491,7 +491,7 @@ 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) {
+ if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) {
*sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
return true;
}
« chrome/chrome_renderer.gypi ('K') | « chrome/common/all_messages.h ('k') | chrome/common/chrome_paths.h » ('j') | chrome/common/nacl_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698