diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 19:53:14 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 19:53:14 +0000 |
| commit | 1fcfb2066570eb096964567c841f6a1bd6cb1ec5 (patch) | |
| tree | 5cac121ea9daa9436903e6c30902ed9c49033e32 /chrome/app/client_util.cc | |
| parent | b0dee8a4fb85517e0b57daf343293f945796940d (diff) | |
| download | chromium_src-1fcfb2066570eb096964567c841f6a1bd6cb1ec5.zip chromium_src-1fcfb2066570eb096964567c841f6a1bd6cb1ec5.tar.gz chromium_src-1fcfb2066570eb096964567c841f6a1bd6cb1ec5.tar.bz2 | |
Take two at splitting result codes between content and chrome.
content/common/result_codes.h contains only the codes defined in content. chrome/common/chrome_result_codes.h contains the codes defined in chrome and also includes (for convenience) the content header.
R=jam@chromium.org
BUG=76699
TEST=everything compiles
Review URL: http://codereview.chromium.org/7397004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/client_util.cc')
| -rw-r--r-- | chrome/app/client_util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc index 4cd668e..0f1d104d 100644 --- a/chrome/app/client_util.cc +++ b/chrome/app/client_util.cc @@ -18,6 +18,7 @@ #include "chrome/app/breakpad_win.h" #include "chrome/app/client_util.h" #include "chrome/common/chrome_constants.h" +#include "chrome/common/chrome_result_codes.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/channel_info.h" @@ -25,7 +26,6 @@ #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/util_constants.h" -#include "content/common/result_codes.h" namespace { // The entry point signature of chrome.dll. @@ -243,7 +243,7 @@ int MainDllLoader::Launch(HINSTANCE instance, std::wstring file; dll_ = Load(&version, &file); if (!dll_) - return ResultCodes::MISSING_DATA; + return chrome::RESULT_CODE_MISSING_DATA; scoped_ptr<base::Environment> env(base::Environment::Create()); env->SetVar(chrome::kChromeVersionEnvVar, WideToUTF8(version)); @@ -254,7 +254,7 @@ int MainDllLoader::Launch(HINSTANCE instance, DLL_MAIN entry_point = reinterpret_cast<DLL_MAIN>(::GetProcAddress(dll_, "ChromeMain")); if (!entry_point) - return ResultCodes::BAD_PROCESS_TYPE; + return chrome::RESULT_CODE_BAD_PROCESS_TYPE; int rc = entry_point(instance, sbox_info, ::GetCommandLineW()); return OnBeforeExit(rc, file); @@ -292,7 +292,7 @@ class ChromeDllLoader : public MainDllLoader { // NORMAL_EXIT_CANCEL is used for experiments when the user cancels // so we need to reset the did_run signal so omaha does not count // this run as active usage. - if (ResultCodes::NORMAL_EXIT_CANCEL == return_code) { + if (chrome::RESULT_CODE_NORMAL_EXIT_CANCEL == return_code) { ClearDidRun(dll_path); } return return_code; |