summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-15 20:47:40 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-15 20:47:40 +0000
commit36d772caff4517f3dc536f582816ac786508e2cb (patch)
tree97c04d0eb3e3d205ef980686ebb8300a2596e725 /chrome/installer/util
parent7fea8ad60431ed71df2a087b131e4a5cde2b6755 (diff)
downloadchromium_src-36d772caff4517f3dc536f582816ac786508e2cb.zip
chromium_src-36d772caff4517f3dc536f582816ac786508e2cb.tar.gz
chromium_src-36d772caff4517f3dc536f582816ac786508e2cb.tar.bz2
Revert r92730, r92731, r92732 ... will land again once I ensure the win builds compile.
TBR=jam@chromium.org BUG=none TEST= Review URL: http://codereview.chromium.org/7400002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util')
-rw-r--r--chrome/installer/util/google_chrome_distribution.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index dc1c835..11d2128 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -24,7 +24,6 @@
#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"
@@ -37,6 +36,7 @@
#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 content::RESULT_CODE_NORMAL_EXIT:
+ case ResultCodes::NORMAL_EXIT:
outcome = kToastExpTriesOkGroup;
break;
- case chrome::RESULT_CODE_NORMAL_EXIT_CANCEL:
+ case ResultCodes::NORMAL_EXIT_CANCEL:
outcome = kToastExpCancelGroup;
break;
- case chrome::RESULT_CODE_NORMAL_EXIT_EXP2:
+ case ResultCodes::NORMAL_EXIT_EXP2:
outcome = kToastExpUninstallGroup;
break;
default: