diff options
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index e8232d7..78d5ab4 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -78,7 +78,6 @@ #include "chrome/browser/web_resource/gpu_blacklist_updater.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/chrome_result_codes.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/env_vars.h" @@ -95,6 +94,7 @@ #include "content/common/content_client.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" +#include "content/common/result_codes.h" #include "grit/app_locale_settings.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -1428,12 +1428,12 @@ int BrowserMain(const MainFunctionParams& parameters) { TryChromeDialogView::Result answer = TryChromeDialogView::Show(try_chrome_int, &process_singleton); if (answer == TryChromeDialogView::NOT_NOW) - return chrome::RESULT_CODE_NORMAL_EXIT_CANCEL; + return ResultCodes::NORMAL_EXIT_CANCEL; if (answer == TryChromeDialogView::UNINSTALL_CHROME) - return chrome::RESULT_CODE_NORMAL_EXIT_EXP2; + return ResultCodes::NORMAL_EXIT_EXP2; #else // We don't support retention experiments on Mac or Linux. - return content::RESULT_CODE_NORMAL_EXIT; + return ResultCodes::NORMAL_EXIT; #endif // defined(OS_WIN) } @@ -1564,8 +1564,7 @@ int BrowserMain(const MainFunctionParams& parameters) { return HandleIconsCommands(parsed_command_line); if (parsed_command_line.HasSwitch(switches::kMakeDefaultBrowser)) { return ShellIntegration::SetAsDefaultBrowser() ? - static_cast<int>(content::RESULT_CODE_NORMAL_EXIT) : - static_cast<int>(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED); + ResultCodes::NORMAL_EXIT : ResultCodes::SHELL_INTEGRATION_FAILED; } // If the command line specifies --pack-extension, attempt the pack extension @@ -1573,9 +1572,9 @@ int BrowserMain(const MainFunctionParams& parameters) { if (parsed_command_line.HasSwitch(switches::kPackExtension)) { ExtensionsStartupUtil extension_startup_util; if (extension_startup_util.PackExtension(parsed_command_line)) { - return content::RESULT_CODE_NORMAL_EXIT; + return ResultCodes::NORMAL_EXIT; } else { - return chrome::RESULT_CODE_PACK_EXTENSION_ERROR; + return ResultCodes::PACK_EXTENSION_ERROR; } } @@ -1601,10 +1600,10 @@ int BrowserMain(const MainFunctionParams& parameters) { printf("%s\n", base::SysWideToNativeMB(UTF16ToWide( l10n_util::GetStringUTF16(IDS_USED_EXISTING_BROWSER))).c_str()); #endif - return content::RESULT_CODE_NORMAL_EXIT; + return ResultCodes::NORMAL_EXIT; case ProcessSingleton::PROFILE_IN_USE: - return chrome::RESULT_CODE_PROFILE_IN_USE; + return ResultCodes::PROFILE_IN_USE; case ProcessSingleton::LOCK_ERROR: LOG(ERROR) << "Failed to create a ProcessSingleton for your profile " @@ -1612,7 +1611,7 @@ int BrowserMain(const MainFunctionParams& parameters) { "would start multiple browser processes rather than " "opening a new window in the existing process. Aborting " "now to avoid profile corruption."; - return chrome::RESULT_CODE_PROFILE_IN_USE; + return ResultCodes::PROFILE_IN_USE; default: NOTREACHED(); @@ -1660,7 +1659,7 @@ int BrowserMain(const MainFunctionParams& parameters) { Profile* profile = CreateProfile(parameters, user_data_dir); if (!profile) - return content::RESULT_CODE_NORMAL_EXIT; + return ResultCodes::NORMAL_EXIT; // Post-profile init --------------------------------------------------------- @@ -1702,7 +1701,7 @@ int BrowserMain(const MainFunctionParams& parameters) { #if defined(OS_WIN) // Do the tasks if chrome has been upgraded while it was last running. if (!already_running && upgrade_util::DoUpgradeTasks(parsed_command_line)) - return content::RESULT_CODE_NORMAL_EXIT; + return ResultCodes::NORMAL_EXIT; #endif // Check if there is any machine level Chrome installed on the current @@ -1715,7 +1714,7 @@ int BrowserMain(const MainFunctionParams& parameters) { // Do not allow this to occur for Chrome Frame user-to-system handoffs. if (!parsed_command_line.HasSwitch(switches::kChromeFrame) && CheckMachineLevelInstall()) - return chrome::RESULT_CODE_MACHINE_LEVEL_INSTALL_EXISTS; + return ResultCodes::MACHINE_LEVEL_INSTALL_EXISTS; // Create the TranslateManager singleton. TranslateManager* translate_manager = TranslateManager::GetInstance(); @@ -1728,7 +1727,7 @@ int BrowserMain(const MainFunctionParams& parameters) { if (MaybeInstallFromDiskImage()) { // The application was installed and the installed copy has been // launched. This process is now obsolete. Exit. - return content::RESULT_CODE_NORMAL_EXIT; + return ResultCodes::NORMAL_EXIT; } } #endif @@ -1920,9 +1919,9 @@ int BrowserMain(const MainFunctionParams& parameters) { if (parsed_command_line.HasSwitch(switches::kUninstallExtension)) { ExtensionsStartupUtil ext_startup_util; if (ext_startup_util.UninstallExtension(parsed_command_line, profile)) { - return content::RESULT_CODE_NORMAL_EXIT; + return ResultCodes::NORMAL_EXIT; } else { - return chrome::RESULT_CODE_UNINSTALL_EXTENSION_ERROR; + return ResultCodes::UNINSTALL_EXTENSION_ERROR; } } @@ -1967,7 +1966,7 @@ int BrowserMain(const MainFunctionParams& parameters) { // Start watching all browser threads for responsiveness. ThreadWatcherList::StartWatchingAll(parsed_command_line); - int result_code = content::RESULT_CODE_NORMAL_EXIT; + int result_code = ResultCodes::NORMAL_EXIT; if (parameters.ui_task) { // We are in test mode. Run one task and enter the main message loop. if (pool) |