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

Unified Diff: chrome/browser/signin/easy_unlock_service.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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/browser/signin/easy_unlock_service.cc
diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc
index 4ccbcda307e4020cac3f421746b0838d3a5579ab..2f33e2019851c6693808310b35ec1fe89e32de56 100644
--- a/chrome/browser/signin/easy_unlock_service.cc
+++ b/chrome/browser/signin/easy_unlock_service.cc
@@ -30,7 +30,6 @@
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
@@ -44,6 +43,7 @@
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/user_manager/user.h"
+#include "components/version_info/version_info.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_adapter_factory.h"
@@ -677,13 +677,12 @@ cryptauth::DeviceClassifier EasyUnlockService::GetDeviceClassifier() {
device_classifier.set_device_type(cryptauth::CHROME);
#endif
- chrome::VersionInfo version_info;
const std::vector<uint32_t>& version_components =
- base::Version(version_info.Version()).components();
+ base::Version(version_info::GetVersionNumber()).components();
if (version_components.size() > 0)
device_classifier.set_device_software_version_code(version_components[0]);
- device_classifier.set_device_software_package(version_info.Name());
+ device_classifier.set_device_software_package(version_info::GetProductName());
return device_classifier;
}
« no previous file with comments | « chrome/browser/signin/chrome_signin_client.cc ('k') | chrome/browser/supervised_user/supervised_user_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698