diff options
| author | cpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-13 20:52:18 +0000 |
|---|---|---|
| committer | cpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-13 20:52:18 +0000 |
| commit | 53c38d23fb0d73d48f3fd804da52fd374d08e2c9 (patch) | |
| tree | 675f149d7c8d4867f8594fe0ec2bdd02aa53dd51 /chrome/browser/browser_main.cc | |
| parent | 79db623ab30e307049cd9ad0cc22a8ff1a399cbb (diff) | |
| download | chromium_src-53c38d23fb0d73d48f3fd804da52fd374d08e2c9.zip chromium_src-53c38d23fb0d73d48f3fd804da52fd374d08e2c9.tar.gz chromium_src-53c38d23fb0d73d48f3fd804da52fd374d08e2c9.tar.bz2 | |
Small cleanup of DoUninstallTasks()
- eliminates one #ifdef
- Did I mention is cleaner?
Review URL: http://codereview.chromium.org/21331
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 89ce130..31a10c2 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -379,19 +379,8 @@ int BrowserMain(const MainFunctionParams& parameters) { // If the command line specifies 'uninstall' then we need to work here // unless we detect another chrome browser running. - if (parsed_command_line.HasSwitch(switches::kUninstall)) { - if (already_running) { -#if defined(OS_WIN) - const std::wstring text = l10n_util::GetString(IDS_UNINSTALL_CLOSE_APP); - const std::wstring caption = l10n_util::GetString(IDS_PRODUCT_NAME); - win_util::MessageBox(NULL, text, caption, - MB_OK | MB_ICONWARNING | MB_TOPMOST); -#endif - return ResultCodes::UNINSTALL_CHROME_ALIVE; - } else { - return DoUninstallTasks(); - } - } + if (parsed_command_line.HasSwitch(switches::kUninstall)) + return DoUninstallTasks(already_running); if (parsed_command_line.HasSwitch(switches::kHideIcons) || parsed_command_line.HasSwitch(switches::kShowIcons)) { |