This change will split the result codes between content and chrome.

chrome/browser/browser_main_win.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/browser_main.h"
 #include "chrome/browser/browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/scoped_native_library.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/browser_util_win.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/uninstall_view.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "content/common/main_function_params.h"
-#include "content/common/result_codes.h"
 #include "crypto/nss_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/winsock_init.h"
 #include "net/socket/client_socket_factory.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/message_box_win.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/widget/widget.h"
@@ skipping 46 matching lines @@
 
   base::TimeDelta elapsed_from_startup =
       base::Time::Now() - base::Time::FromFileTime(creation_time);
 
   // Record the time to present in a histogram.
   UMA_HISTOGRAM_MEDIUM_TIMES("Startup.BrowserMessageLoopStartTime",
                              elapsed_from_startup);
 }
 
 int AskForUninstallConfirmation() {
-  int ret = ResultCodes::NORMAL_EXIT;
+  int ret = content::RESULT_CODE_NORMAL_EXIT;
   views::Widget::CreateWindow(new UninstallView(ret))->Show();
   views::AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->Run(&accelerator_handler);
   return ret;
 }
 
 void ShowCloseBrowserFirstMessageBox() {
   const string16 text = l10n_util::GetStringUTF16(IDS_UNINSTALL_CLOSE_APP);
   const string16 caption = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
   const UINT flags = MB_OK | MB_ICONWARNING | MB_TOPMOST;
   ui::MessageBox(NULL, text, caption, flags);
 }
 
 int DoUninstallTasks(bool chrome_still_running) {
   // We want to show a warning to user (and exit) if Chrome is already running
   // *before* we show the uninstall confirmation dialog box. But while the
   // uninstall confirmation dialog is up, user might start Chrome, so we
   // check once again after user acknowledges Uninstall dialog.
   if (chrome_still_running) {
     ShowCloseBrowserFirstMessageBox();
-    return ResultCodes::UNINSTALL_CHROME_ALIVE;
+    return chrome::RESULT_CODE_UNINSTALL_CHROME_ALIVE;
   }
   int ret = AskForUninstallConfirmation();
   if (browser_util::IsBrowserAlreadyRunning()) {
     ShowCloseBrowserFirstMessageBox();
-    return ResultCodes::UNINSTALL_CHROME_ALIVE;
+    return chrome::RESULT_CODE_UNINSTALL_CHROME_ALIVE;
   }
 
-  if (ret != ResultCodes::UNINSTALL_USER_CANCEL) {
+  if (ret != chrome::RESULT_CODE_UNINSTALL_USER_CANCEL) {
     // The following actions are just best effort.
     VLOG(1) << "Executing uninstall actions";
     if (!FirstRun::RemoveSentinel())
       VLOG(1) << "Failed to delete sentinel file.";
     // We want to remove user level shortcuts and we only care about the ones
     // created by us and not by the installer so |alternate| is false.
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     if (!ShellUtil::RemoveChromeDesktopShortcut(dist, ShellUtil::CURRENT_USER,
                                                 false))
       VLOG(1) << "Failed to delete desktop shortcut.";
@@ skipping 76 matching lines @@
 // functionality so we just ask the users if they want to uninstall Chrome.
 int HandleIconsCommands(const CommandLine& parsed_command_line) {
   if (parsed_command_line.HasSwitch(switches::kHideIcons)) {
     string16 cp_applet;
     base::win::Version version = base::win::GetVersion();
     if (version >= base::win::VERSION_VISTA) {
       cp_applet.assign(L"Programs and Features");  // Windows Vista and later.
     } else if (version >= base::win::VERSION_XP) {
       cp_applet.assign(L"Add/Remove Programs");  // Windows XP.
     } else {
-      return ResultCodes::UNSUPPORTED_PARAM;  // Not supported
+      return chrome::RESULT_CODE_UNSUPPORTED_PARAM;  // Not supported
     }
 
     const string16 msg =
         l10n_util::GetStringFUTF16(IDS_HIDE_ICONS_NOT_SUPPORTED, cp_applet);
     const string16 caption = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
     const UINT flags = MB_OKCANCEL | MB_ICONWARNING | MB_TOPMOST;
     if (IDOK == ui::MessageBox(NULL, msg, caption, flags))
       ShellExecute(NULL, NULL, L"appwiz.cpl", NULL, NULL, SW_SHOWNORMAL);
-    return ResultCodes::NORMAL_EXIT;  // Exit as we are not launching browser.
+    return content::RESULT_CODE_NORMAL_EXIT;  // Exit as we are not launching
+                                              // the browser.

[jam, 2011/07/15 19:42:43]

nit: this style of comments is not common in chrome, i.e. just put it all on one
line

[Dirk Pranke, 2011/07/15 20:02:23]

Done.

   }
   // We don't hide icons so we shouldn't do anything special to show them
-  return ResultCodes::UNSUPPORTED_PARAM;
+  return chrome::RESULT_CODE_UNSUPPORTED_PARAM;
 }
 
 // Check if there is any machine level Chrome installed on the current
 // machine. If yes and the current Chrome process is user level, we do not
 // allow the user level Chrome to run. So we notify the user and uninstall
 // user level Chrome.
 bool CheckMachineLevelInstall() {
   // TODO(tommi): Check if using the default distribution is always the right
   // thing to do.
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
@@ skipping 62 matching lines @@
       crypto::EnsureNSPRInit();
     }
   }
 };
 
 // static
 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   return new BrowserMainPartsWin(parameters);
 }