diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 20:47:40 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 20:47:40 +0000 |
| commit | 36d772caff4517f3dc536f582816ac786508e2cb (patch) | |
| tree | 97c04d0eb3e3d205ef980686ebb8300a2596e725 /chrome/nacl/nacl_main.cc | |
| parent | 7fea8ad60431ed71df2a087b131e4a5cde2b6755 (diff) | |
| download | chromium_src-36d772caff4517f3dc536f582816ac786508e2cb.zip chromium_src-36d772caff4517f3dc536f582816ac786508e2cb.tar.gz chromium_src-36d772caff4517f3dc536f582816ac786508e2cb.tar.bz2 | |
Revert r92730, r92731, r92732 ... will land again once I ensure the win builds compile.
TBR=jam@chromium.org
BUG=none
TEST=
Review URL: http://codereview.chromium.org/7400002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl/nacl_main.cc')
| -rw-r--r-- | chrome/nacl/nacl_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index 6d882d3..64adb2c 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -13,7 +13,6 @@ #include "base/string_util.h" #include "base/system_monitor/system_monitor.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/chrome_result_codes.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" #include "chrome/nacl/nacl_launcher_thread.h" @@ -21,6 +20,7 @@ #include "content/common/child_process.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" +#include "content/common/result_codes.h" #include "content/common/sandbox_policy.h" #if defined(OS_WIN) @@ -75,7 +75,7 @@ int NaClBrokerMain(const MainFunctionParams& parameters) { } #else int NaClBrokerMain(const MainFunctionParams& parameters) { - return chrome::RESULT_CODE_BAD_PROCESS_TYPE; + return ResultCodes::BAD_PROCESS_TYPE; } #endif // _WIN64 |