diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-04 22:47:37 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-04 22:47:37 +0000 |
| commit | 4bc818e1dc285910638203a0d94063a9e92e36b0 (patch) | |
| tree | 871de4bc758b249b02246e0a449cd3c7960f76e3 /sandbox/src/interception_agent.cc | |
| parent | bd06fc48da4098267e99ae9e03313c3689100147 (diff) | |
| download | chromium_src-4bc818e1dc285910638203a0d94063a9e92e36b0.zip chromium_src-4bc818e1dc285910638203a0d94063a9e92e36b0.tar.gz chromium_src-4bc818e1dc285910638203a0d94063a9e92e36b0.tar.bz2 | |
Sandbox: Finish the interception manager support for x64.
Unit tests and integration tests run (as long as they don't
depend on IPCs), both regular and under SANDBOX_EXPORTS.
The interception agent is there, but no EAT interceptions yet.
BUG=27218
TEST=unit tests/ integration tests.
Review URL: http://codereview.chromium.org/565026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src/interception_agent.cc')
| -rw-r--r-- | sandbox/src/interception_agent.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sandbox/src/interception_agent.cc b/sandbox/src/interception_agent.cc index 08df720..f9f9cf7 100644 --- a/sandbox/src/interception_agent.cc +++ b/sandbox/src/interception_agent.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -200,11 +200,14 @@ ResolverThunk* InterceptionAgent::GetResolver(InterceptionType type) { if (!eat_resolver) eat_resolver = new(NT_ALLOC) EatResolverThunk; +#if !defined(_WIN64) + // Sidestep is not supported for x64. if (!sidestep_resolver) sidestep_resolver = new(NT_ALLOC) SidestepResolverThunk; if (!smart_sidestep_resolver) smart_sidestep_resolver = new(NT_ALLOC) SmartSidestepResolverThunk; +#endif switch (type) { case INTERCEPTION_EAT: |