diff options
Diffstat (limited to 'chrome/browser/browser_main_win.cc')
| -rw-r--r-- | chrome/browser/browser_main_win.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 8911307..65a991f 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -19,7 +19,7 @@ #include "base/path_service.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" -#include "base/win_util.h" +#include "base/win/windows_version.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/metrics/metrics_service.h" @@ -49,7 +49,7 @@ void RecordBreakpadStatusUMA(MetricsService* metrics) { } void WarnAboutMinimumSystemRequirements() { - if (win_util::GetWinVersion() < win_util::WINVERSION_XP) { + if (base::win::GetVersion() < base::win::VERSION_XP) { // Display a warning message if the user is running chrome on Windows 2000. const std::wstring text = l10n_util::GetString(IDS_UNSUPPORTED_OS_PRE_WIN_XP); @@ -92,15 +92,15 @@ int DoUninstallTasks(bool chrome_still_running) { if (ret != ResultCodes::UNINSTALL_USER_CANCEL) { // The following actions are just best effort. - LOG(INFO) << "Executing uninstall actions"; + VLOG(1) << "Executing uninstall actions"; if (!FirstRun::RemoveSentinel()) - LOG(INFO) << "Failed to delete sentinel file."; + VLOG(1) << "Failed to delete sentinel file."; // We want to remove user level shortcuts and we only care about the ones // created by us and not by the installer so |alternate| is false. if (!ShellUtil::RemoveChromeDesktopShortcut(ShellUtil::CURRENT_USER, false)) - LOG(INFO) << "Failed to delete desktop shortcut."; + VLOG(1) << "Failed to delete desktop shortcut."; if (!ShellUtil::RemoveChromeQuickLaunchShortcut(ShellUtil::CURRENT_USER)) - LOG(INFO) << "Failed to delete quick launch shortcut."; + VLOG(1) << "Failed to delete quick launch shortcut."; } return ret; } @@ -148,10 +148,10 @@ void PrepareRestartOnCrashEnviroment(const CommandLine &parsed_command_line) { int HandleIconsCommands(const CommandLine &parsed_command_line) { if (parsed_command_line.HasSwitch(switches::kHideIcons)) { std::wstring cp_applet; - win_util::WinVersion version = win_util::GetWinVersion(); - if (version >= win_util::WINVERSION_VISTA) { + base::win::Version version = base::win::GetVersion(); + if (version >= base::win::VERSION_VISTA) { cp_applet.assign(L"Programs and Features"); // Windows Vista and later. - } else if (version >= win_util::WINVERSION_XP) { + } else if (version >= base::win::VERSION_XP) { cp_applet.assign(L"Add/Remove Programs"); // Windows XP. } else { return ResultCodes::UNSUPPORTED_PARAM; // Not supported |