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

Side by Side Diff: sandbox/src/sandbox.cc

Issue 543058: Prepare the sandbox for integration with NaCl broker for 64-bit Windows. The ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sandbox/sandbox.gyp ('k') | sandbox/src/sandbox_policy_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 <stdio.h> 5 #include <stdio.h>
6 #include <windows.h> 6 #include <windows.h>
7 #include "sandbox/src/sandbox.h" 7 #include "sandbox/src/sandbox.h"
8 #include "sandbox/src/sandbox_factory.h" 8 #include "sandbox/src/sandbox_factory.h"
9 #include "sandbox/src/broker_services.h" 9 #include "sandbox/src/broker_services.h"
10 #include "sandbox/src/target_services.h" 10 #include "sandbox/src/target_services.h"
11 11
12 #ifdef _WIN64 12 #if defined(_WIN64) && !defined(NACL_WIN64)
13 // We allow building this code for Win64 as part of NaCl to enable development
13 #error Sandbox code was not tested on 64-bit Windows. See \ 14 #error Sandbox code was not tested on 64-bit Windows. See \
14 http://code.google.com/p/chromium/issues/detail?id=27218 for details \ 15 http://code.google.com/p/chromium/issues/detail?id=27218 for details \
15 and progress log. 16 and progress log.
16 #endif 17 #endif
17 18
18 19
19 namespace sandbox { 20 namespace sandbox {
20 // The section for IPC and policy. 21 // The section for IPC and policy.
21 SANDBOX_INTERCEPT HANDLE g_shared_section = NULL; 22 SANDBOX_INTERCEPT HANDLE g_shared_section = NULL;
22 23
(...skipping 19 matching lines...) Expand all
42 if (NULL == g_shared_section) { 43 if (NULL == g_shared_section) {
43 return NULL; 44 return NULL;
44 } 45 }
45 // We are the target 46 // We are the target
46 s_is_broker = false; 47 s_is_broker = false;
47 // Creates and returns the target services implementation. 48 // Creates and returns the target services implementation.
48 return TargetServicesBase::GetInstance(); 49 return TargetServicesBase::GetInstance();
49 } 50 }
50 51
51 } // namespace sandbox 52 } // namespace sandbox
OLDNEW
« no previous file with comments | « sandbox/sandbox.gyp ('k') | sandbox/src/sandbox_policy_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698