Commit 5e41247f authored by Victor-Gabriel Savu's avatar Victor-Gabriel Savu Committed by Commit Bot

Add LTS to the version in feedback reports

Add LTS to the reported feedback in feedback reports. This will
allow queries in Listnr to either include or exclude LTS
customers.

Bug: chromium:1146354
Change-Id: Iee4c724206666bff804991bf8c00610883ac5cb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521182Reviewed-by: default avatarAchuith Bhandarkar <achuith@chromium.org>
Reviewed-by: default avatarMiriam Zimmerman <mutexlox@chromium.org>
Commit-Queue: Victor-Gabriel Savu <vsavu@google.com>
Cr-Commit-Position: refs/heads/master@{#825744}
parent 793ad828
...@@ -48,10 +48,12 @@ ...@@ -48,10 +48,12 @@
#include "chrome/browser/chromeos/login/demo_mode/demo_session.h" #include "chrome/browser/chromeos/login/demo_mode/demo_session.h"
#include "chrome/browser/chromeos/login/login_pref_names.h" #include "chrome/browser/chromeos/login/login_pref_names.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/metrics/chromeos_metrics_provider.h" #include "chrome/browser/metrics/chromeos_metrics_provider.h"
#include "chrome/browser/metrics/enrollment_status.h" #include "chrome/browser/metrics/enrollment_status.h"
#include "chromeos/constants/chromeos_features.h" #include "chromeos/constants/chromeos_features.h"
#include "chromeos/dbus/util/version_loader.h" #include "chromeos/dbus/util/version_loader.h"
#include "chromeos/settings/cros_settings_names.h"
#include "chromeos/system/statistics_provider.h" #include "chromeos/system/statistics_provider.h"
#endif #endif
...@@ -91,6 +93,7 @@ constexpr char kChromeEnrollmentTag[] = "ENTERPRISE_ENROLLED"; ...@@ -91,6 +93,7 @@ constexpr char kChromeEnrollmentTag[] = "ENTERPRISE_ENROLLED";
constexpr char kHWIDKey[] = "HWID"; constexpr char kHWIDKey[] = "HWID";
constexpr char kSettingsKey[] = "settings"; constexpr char kSettingsKey[] = "settings";
constexpr char kLocalStateSettingsResponseKey[] = "Local State: settings"; constexpr char kLocalStateSettingsResponseKey[] = "Local State: settings";
constexpr char kLTSChromeVersionPrefix[] = "LTS ";
constexpr char kArcStatusKey[] = "CHROMEOS_ARC_STATUS"; constexpr char kArcStatusKey[] = "CHROMEOS_ARC_STATUS";
constexpr char kMonitorInfoKey[] = "monitor_info"; constexpr char kMonitorInfoKey[] = "monitor_info";
constexpr char kAccountTypeKey[] = "account_type"; constexpr char kAccountTypeKey[] = "account_type";
...@@ -242,6 +245,14 @@ std::string GetChromeVersionString() { ...@@ -242,6 +245,14 @@ std::string GetChromeVersionString() {
#endif #endif
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
// If the device is receiving LTS updates, add a prefix to the version string.
// The value of the policy is ignored here.
std::string value;
const bool is_lts = chromeos::CrosSettings::Get()->GetString(
chromeos::kReleaseLtsTag, &value);
if (is_lts)
browser_version = kLTSChromeVersionPrefix + browser_version;
// If lacros-chrome is allowed & supported, and launched before, which // If lacros-chrome is allowed & supported, and launched before, which
// is indicated by |lacros_version| in BrowserManager being set to non-empty // is indicated by |lacros_version| in BrowserManager being set to non-empty
// string during lacros startup, attach its version in the chrome // string during lacros startup, attach its version in the chrome
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment