diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 20:07:08 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 20:07:08 +0000 |
| commit | 785c9672b5f4e423487147904930110dae0049d9 (patch) | |
| tree | c4fef8478f128c7a6aa3d49db9e8d6eb50432bbc /chrome/nacl | |
| parent | 6bff761d7589fc7b638de6f1ce684f559711316b (diff) | |
| download | chromium_src-785c9672b5f4e423487147904930110dae0049d9.zip chromium_src-785c9672b5f4e423487147904930110dae0049d9.tar.gz chromium_src-785c9672b5f4e423487147904930110dae0049d9.tar.bz2 | |
This change will split the result codes between content and chrome.
This adds a new file into chrome/common and does a lot of renaming.
The current version is just a sketch of the headers, and nothing will
compile.
R=jam@chromium.org
BUG=76699
TEST=everything still compiles and runs
Review URL: http://codereview.chromium.org/7377010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
| -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 64adb2c..6d882d3 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -13,6 +13,7 @@ #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" @@ -20,7 +21,6 @@ #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 ResultCodes::BAD_PROCESS_TYPE; + return chrome::RESULT_CODE_BAD_PROCESS_TYPE; } #endif // _WIN64 |