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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/nacl/nacl_main.cc

Issue 7397004: Take two at splitting result codes between content and chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile failure in uninstall.cc Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.cc ('k') | chrome/service/service_child_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/nacl/nacl_main.cc
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index 64adb2ccb12a099351a4b2ca78fe7c0b40222fe9..6d882d300d013c65a23fbf5c7ea899213ebe4bd6 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
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.cc ('k') | chrome/service/service_child_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698