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

Unified Diff: chrome/installer/util/google_chrome_distribution.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/setup/uninstall.cc ('k') | chrome/nacl/nacl_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/google_chrome_distribution.cc
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 11d2128adb4841a3d6c599de4522a647f78d2cf1..dc1c835641a9a2e05eff462060d819672d2fd141 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -24,6 +24,7 @@
#include "base/win/registry.h"
#include "base/win/windows_version.h"
#include "chrome/common/attrition_experiments.h"
+#include "chrome/common/chrome_result_codes.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/installer/util/channel_info.h"
@@ -36,7 +37,6 @@
#include "chrome/installer/util/util_constants.h"
#include "chrome/installer/util/wmi.h"
#include "content/common/json_value_serializer.h"
-#include "content/common/result_codes.h"
#include "installer_util_strings.h" // NOLINT
@@ -776,13 +776,13 @@ void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor,
// The chrome process has exited, figure out what happened.
const wchar_t* outcome = NULL;
switch (exit_code) {
- case ResultCodes::NORMAL_EXIT:
+ case content::RESULT_CODE_NORMAL_EXIT:
outcome = kToastExpTriesOkGroup;
break;
- case ResultCodes::NORMAL_EXIT_CANCEL:
+ case chrome::RESULT_CODE_NORMAL_EXIT_CANCEL:
outcome = kToastExpCancelGroup;
break;
- case ResultCodes::NORMAL_EXIT_EXP2:
+ case chrome::RESULT_CODE_NORMAL_EXIT_EXP2:
outcome = kToastExpUninstallGroup;
break;
default:
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/nacl/nacl_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698