| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
| 6 #include "chrome/browser/browser_main_win.h" | 6 #include "chrome/browser/browser_main_win.h" |
| 7 | 7 |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 | 10 |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 l10n_util::GetStringUTF16(IDS_MACHINE_LEVEL_INSTALL_CONFLICT); | 259 l10n_util::GetStringUTF16(IDS_MACHINE_LEVEL_INSTALL_CONFLICT); |
| 260 const string16 caption = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 260 const string16 caption = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
| 261 const UINT flags = MB_OK | MB_ICONERROR | MB_TOPMOST; | 261 const UINT flags = MB_OK | MB_ICONERROR | MB_TOPMOST; |
| 262 ui::MessageBox(NULL, text, caption, flags); | 262 ui::MessageBox(NULL, text, caption, flags); |
| 263 CommandLine uninstall_cmd( | 263 CommandLine uninstall_cmd( |
| 264 InstallUtil::GetChromeUninstallCmd(false, dist->GetType())); | 264 InstallUtil::GetChromeUninstallCmd(false, dist->GetType())); |
| 265 if (!uninstall_cmd.GetProgram().empty()) { | 265 if (!uninstall_cmd.GetProgram().empty()) { |
| 266 uninstall_cmd.AppendSwitch(installer::switches::kForceUninstall); | 266 uninstall_cmd.AppendSwitch(installer::switches::kForceUninstall); |
| 267 uninstall_cmd.AppendSwitch( | 267 uninstall_cmd.AppendSwitch( |
| 268 installer::switches::kDoNotRemoveSharedItems); | 268 installer::switches::kDoNotRemoveSharedItems); |
| 269 base::LaunchApp(uninstall_cmd, false, false, NULL); | 269 base::LaunchProcess(uninstall_cmd, base::LaunchOptions()); |
| 270 } | 270 } |
| 271 return true; | 271 return true; |
| 272 } | 272 } |
| 273 } | 273 } |
| 274 return false; | 274 return false; |
| 275 } | 275 } |
| 276 | 276 |
| 277 // BrowserMainPartsWin --------------------------------------------------------- | 277 // BrowserMainPartsWin --------------------------------------------------------- |
| 278 | 278 |
| 279 class BrowserMainPartsWin : public BrowserMainParts { | 279 class BrowserMainPartsWin : public BrowserMainParts { |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 crypto::EnsureNSPRInit(); | 313 crypto::EnsureNSPRInit(); |
| 314 } | 314 } |
| 315 } | 315 } |
| 316 }; | 316 }; |
| 317 | 317 |
| 318 // static | 318 // static |
| 319 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( | 319 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( |
| 320 const MainFunctionParams& parameters) { | 320 const MainFunctionParams& parameters) { |
| 321 return new BrowserMainPartsWin(parameters); | 321 return new BrowserMainPartsWin(parameters); |
| 322 } | 322 } |
| OLD | NEW |