diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 20:49:23 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 20:49:23 +0000 |
| commit | e628fde3462899ba06af2fbc5285563c456ed5c4 (patch) | |
| tree | e3ed3eb98c0044b055606bdf8628191b9b99c17c /chrome/nacl | |
| parent | 23d6315575647756c4be985b895ec2c447e2f088 (diff) | |
| download | chromium_src-e628fde3462899ba06af2fbc5285563c456ed5c4.zip chromium_src-e628fde3462899ba06af2fbc5285563c456ed5c4.tar.gz chromium_src-e628fde3462899ba06af2fbc5285563c456ed5c4.tar.bz2 | |
Emergency revert; rietveld broke; tree broke
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
| -rw-r--r-- | chrome/nacl/DEPS | 2 | ||||
| -rw-r--r-- | chrome/nacl/nacl_exe_win_64.cc | 2 | ||||
| -rw-r--r-- | chrome/nacl/nacl_main_platform_delegate_win.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/nacl/DEPS b/chrome/nacl/DEPS index cba9654..d0a3e4fa 100644 --- a/chrome/nacl/DEPS +++ b/chrome/nacl/DEPS @@ -2,7 +2,7 @@ include_rules = [ "+chrome/app/breakpad_win.h", "+content/public/app/startup_helper_win.h", "+sandbox/linux/services", - "+sandbox/win/src", + "+sandbox/src", "+seccompsandbox", "+native_client/src", ] diff --git a/chrome/nacl/nacl_exe_win_64.cc b/chrome/nacl/nacl_exe_win_64.cc index 9184d9c..540f5d0 100644 --- a/chrome/nacl/nacl_exe_win_64.cc +++ b/chrome/nacl/nacl_exe_win_64.cc @@ -20,7 +20,7 @@ #include "content/public/app/startup_helper_win.h" #include "content/public/common/main_function_params.h" #include "content/public/common/sandbox_init.h" -#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/src/sandbox_types.h" extern int NaClMain(const content::MainFunctionParams&); diff --git a/chrome/nacl/nacl_main_platform_delegate_win.cc b/chrome/nacl/nacl_main_platform_delegate_win.cc index 5fd9b22..d2ce5f3 100644 --- a/chrome/nacl/nacl_main_platform_delegate_win.cc +++ b/chrome/nacl/nacl_main_platform_delegate_win.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/native_library.h" #include "chrome/common/chrome_switches.h" -#include "sandbox/win/src/sandbox.h" +#include "sandbox/src/sandbox.h" NaClMainPlatformDelegate::NaClMainPlatformDelegate( const content::MainFunctionParams& parameters) |