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

Unified Diff: chrome/installer/util/google_update_settings.cc

Issue 1301883002: Revert of base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: chrome/installer/util/google_update_settings.cc
diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index 25f418ce8c93e0035a53481977c0e244ed63e943..529c05567baca9897132860065214b6a883c2119 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -798,8 +798,7 @@
return cmd_line;
}
-base::Version GoogleUpdateSettings::GetGoogleUpdateVersion(
- bool system_install) {
+Version GoogleUpdateSettings::GetGoogleUpdateVersion(bool system_install) {
const HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
base::string16 version;
RegKey key;
@@ -809,10 +808,10 @@
KEY_QUERY_VALUE | KEY_WOW64_32KEY) == ERROR_SUCCESS &&
key.ReadValue(google_update::kRegGoogleUpdateVersion, &version) ==
ERROR_SUCCESS) {
- return base::Version(base::UTF16ToUTF8(version));
- }
-
- return base::Version();
+ return Version(base::UTF16ToUTF8(version));
+ }
+
+ return Version();
}
base::Time GoogleUpdateSettings::GetGoogleUpdateLastStartedAU(
« no previous file with comments | « chrome/installer/util/google_update_settings.h ('k') | chrome/installer/util/google_update_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698