diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 21:46:57 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 21:46:57 +0000 |
| commit | bc38c254e32398b444dbccd391c2ae3d6f182001 (patch) | |
| tree | a1e4ba91782a44147002ac30d6a57c0c0b535830 /chrome/browser/browser_main.cc | |
| parent | 75e20841bd18a6053aa41b754ddfcaa1445435d8 (diff) | |
| download | chromium_src-bc38c254e32398b444dbccd391c2ae3d6f182001.zip chromium_src-bc38c254e32398b444dbccd391c2ae3d6f182001.tar.gz chromium_src-bc38c254e32398b444dbccd391c2ae3d6f182001.tar.bz2 | |
first-run: Refactor Upgrade class.
- Split Upgrade class implementation per platform files outside of first_run implementations.
- Move TryChromeDialog class into its own header file.
- Rename TryChromeDialog to TryChromeDialogView.
BUG=None
TEST=None
R=jhawkins@chromium.org
Review URL: http://codereview.chromium.org/6824029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index b7b47b6..40696db 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -41,6 +41,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extensions_startup.h" #include "chrome/browser/first_run/first_run.h" +#include "chrome/browser/first_run/upgrade.h" #include "chrome/browser/gpu_data_manager.h" #include "chrome/browser/jankometer.h" #include "chrome/browser/metrics/histogram_synchronizer.h" @@ -1230,15 +1231,15 @@ int BrowserMain(const MainFunctionParams& parameters) { // It seems that we don't need to run the experiment since chrome // in the same profile is already running. VLOG(1) << "Retention experiment not required"; - return Upgrade::TD_NOT_NOW; + return Upgrade::NOT_NOW; } int try_chrome_int; base::StringToInt(try_chrome, &try_chrome_int); Upgrade::TryResult answer = Upgrade::ShowTryChromeDialog(try_chrome_int, &process_singleton); - if (answer == Upgrade::TD_NOT_NOW) + if (answer == Upgrade::NOT_NOW) return ResultCodes::NORMAL_EXIT_CANCEL; - if (answer == Upgrade::TD_UNINSTALL_CHROME) + if (answer == Upgrade::UNINSTALL_CHROME) return ResultCodes::NORMAL_EXIT_EXP2; #else // We don't support retention experiments on Mac or Linux. |