Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4498)

Unified Diff: chrome/browser/first_run/upgrade_util_win.cc

Issue 10683005: Remove two deprecated methods from base::Version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/user_script_master.cc ('k') | chrome/browser/gpu_blacklist.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/first_run/upgrade_util_win.cc
diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
index a4fc3b06d9ef4fed983f222b59aab8d4bd6d59bc..834a9790a0fdde336dc60a0e5d1e08fd8ca1ca56 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc
@@ -105,16 +105,14 @@ bool SwapNewChromeExeIfPresent() {
if (cmd_line.HasSwitch(switches::kChromeVersion)) {
std::string version_string =
cmd_line.GetSwitchValueASCII(switches::kChromeVersion);
- scoped_ptr<Version> cmd_version(
- Version::GetVersionFromString(version_string));
+ Version cmd_version(version_string);
std::wstring pv_value;
if (key.ReadValue(google_update::kRegVersionField,
&pv_value) == ERROR_SUCCESS) {
- scoped_ptr<Version> pv_version(
- Version::GetVersionFromString(WideToASCII(pv_value)));
- if (cmd_version.get() && pv_version.get() &&
- !cmd_version->Equals(*pv_version.get())) {
+ Version pv_version(WideToASCII(pv_value));
+ if (cmd_version.IsValid() && pv_version.IsValid() &&
+ !cmd_version.Equals(pv_version)) {
return false;
}
}
« no previous file with comments | « chrome/browser/extensions/user_script_master.cc ('k') | chrome/browser/gpu_blacklist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698