diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 00:41:23 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 00:41:23 +0000 |
commit | 74d1bb0fa3b80cb16100142da9cf7b18a552cda3 (patch) | |
tree | f4c2faba710bd92871421d73a1ac9b9778d63877 /chrome/app | |
parent | 1b44bb9683e902b84616e42d00f486dc0ca4ed9a (diff) | |
download | chromium_src-74d1bb0fa3b80cb16100142da9cf7b18a552cda3.zip chromium_src-74d1bb0fa3b80cb16100142da9cf7b18a552cda3.tar.gz chromium_src-74d1bb0fa3b80cb16100142da9cf7b18a552cda3.tar.bz2 |
Move chrome/apps/result_codes.h to chrome/common/result_codes.h
Review URL: http://codereview.chromium.org/28279
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/chrome_exe.vcproj | 2 | ||||
-rw-r--r-- | chrome/app/chrome_exe_main.cc | 3 | ||||
-rw-r--r-- | chrome/app/result_codes.h | 48 |
3 files changed, 2 insertions, 51 deletions
diff --git a/chrome/app/chrome_exe.vcproj b/chrome/app/chrome_exe.vcproj index d534a30..724e365 100644 --- a/chrome/app/chrome_exe.vcproj +++ b/chrome/app/chrome_exe.vcproj @@ -223,7 +223,7 @@ > </File> <File - RelativePath=".\result_codes.h" + RelativePath="..\common\result_codes.h" > </File> </Files> diff --git a/chrome/app/chrome_exe_main.cc b/chrome/app/chrome_exe_main.cc index d8fed89..053f149 100644 --- a/chrome/app/chrome_exe_main.cc +++ b/chrome/app/chrome_exe_main.cc @@ -14,8 +14,8 @@ #include "chrome/app/breakpad.h" #include "chrome/app/client_util.h" #include "chrome/app/google_update_client.h" -#include "chrome/app/result_codes.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/result_codes.h" #include "sandbox/src/sandbox_factory.h" #include "sandbox/src/dep.h" @@ -105,4 +105,3 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev_instance, return ResultCodes::GOOGLE_UPDATE_LAUNCH_FAILED; } - diff --git a/chrome/app/result_codes.h b/chrome/app/result_codes.h deleted file mode 100644 index 950863e..0000000 --- a/chrome/app/result_codes.h +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) 2006-2008 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. - -#ifndef CHROME_APP_RESULT_CODES_H__ -#define CHROME_APP_RESULT_CODES_H__ - -#include "base/process_util.h" - -// This file consolidates all the return codes for the browser and renderer -// process. The return code is the value that: -// a) is returned by main() or winmain(), or -// b) specified in the call for ExitProcess() or TerminateProcess(), or -// c) the exception value that causes a process to terminate. -// -// It is advisable to not use negative numbers because the Windows API returns -// it as an unsigned long and the exception values have high numbers. For -// example EXCEPTION_ACCESS_VIOLATION value is 0xC0000005. - -class ResultCodes { - public: - enum ExitCode { - NORMAL_EXIT = base::PROCESS_END_NORMAL_TERMINATON, - TASKMAN_KILL = base::PROCESS_END_KILLED_BY_USER, - HUNG = base::PROCESS_END_PROCESS_WAS_HUNG, - INVALID_CMDLINE_URL, // An invalid command line url was given. - SBOX_INIT_FAILED, // The sandbox could not be initialized. - GOOGLE_UPDATE_INIT_FAILED, // The Google Update client stub init failed. - GOOGLE_UPDATE_LAUNCH_FAILED,// Google Update could not launch chrome DLL. - BAD_PROCESS_TYPE, // The process is of an unknown type. - MISSING_PATH, // An critical chrome path is missing. - MISSING_DATA, // A critical chrome file is missing. - SHELL_INTEGRATION_FAILED, // Failed to make Chrome default browser. - MACHINE_LEVEL_INSTALL_EXISTS, // Machine level install exists - UNINSTALL_DELETE_FILE_ERROR,// Error while deleting shortcuts. - UNINSTALL_CHROME_ALIVE, // Uninstall detected another chrome instance. - UNINSTALL_NO_SURVEY, // Do not launch survey after uninstall. - UNINSTALL_USER_CANCEL, // The user changed her mind. - UNSUPPORTED_PARAM, // Command line parameter is not supported. - KILLED_BAD_MESSAGE, // A bad message caused the process termination. - IMPORTER_CANCEL, // The user canceled the browser import. - IMPORTER_HUNG, // Browser import hung and was killed. - EXIT_LAST_CODE // Last return code (keep it last). - }; -}; - -#endif // CHROME_APP_RESULT_CODES_H__ - |