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

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

Issue 12221109: Remove sandbox win64 warning (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | « no previous file | no next file » | 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/win/src/sandbox.h" 7 #include "sandbox/win/src/sandbox.h"
8 #include "sandbox/win/src/sandbox_factory.h" 8 #include "sandbox/win/src/sandbox_factory.h"
9 #include "sandbox/win/src/broker_services.h" 9 #include "sandbox/win/src/broker_services.h"
10 #include "sandbox/win/src/target_services.h" 10 #include "sandbox/win/src/target_services.h"
11 11
12 #if defined(_WIN64) && !defined(NACL_WIN64)
13 // We allow building this code for Win64 as part of NaCl to enable development
14 #pragma message("Sandbox code was not fully tested on 64-bit Windows.\
15 crbug.com/168414 ")
16 #endif
17
18
19 namespace sandbox { 12 namespace sandbox {
20 // The section for IPC and policy. 13 // The section for IPC and policy.
21 SANDBOX_INTERCEPT HANDLE g_shared_section = NULL; 14 SANDBOX_INTERCEPT HANDLE g_shared_section = NULL;
22 15
23 static bool s_is_broker = false; 16 static bool s_is_broker = false;
24 17
25 // GetBrokerServices: the current implementation relies on a shared section 18 // GetBrokerServices: the current implementation relies on a shared section
26 // that is created by the broker and opened by the target. 19 // that is created by the broker and opened by the target.
27 BrokerServices* SandboxFactory::GetBrokerServices() { 20 BrokerServices* SandboxFactory::GetBrokerServices() {
28 // Can't be the broker if the shared section is open. 21 // Can't be the broker if the shared section is open.
(...skipping 13 matching lines...) Expand all
42 if (NULL == g_shared_section) { 35 if (NULL == g_shared_section) {
43 return NULL; 36 return NULL;
44 } 37 }
45 // We are the target 38 // We are the target
46 s_is_broker = false; 39 s_is_broker = false;
47 // Creates and returns the target services implementation. 40 // Creates and returns the target services implementation.
48 return TargetServicesBase::GetInstance(); 41 return TargetServicesBase::GetInstance();
49 } 42 }
50 43
51 } // namespace sandbox 44 } // namespace sandbox
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698