aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc29
1 files changed, 14 insertions, 15 deletions
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index 56b456672897..f61540727dc9 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,25 +1,24 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-01-18 21:28:50 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-03-12 23:57:18 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -696,11 +696,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
- #endif // defined(OS_WIN)
-
+@@ -697,10 +697,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
#if defined(OS_WIN) || defined(OS_MAC) || \
-- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
- #endif // defined(OS_WIN) || defined(OS_MAC) || \
-- // (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+ // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+-#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) ||
++#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || defined(OS_BSD) ||
+ // BUILDFLAG(IS_CHROMEOS_LACROS))
#if BUILDFLAG(ENABLE_PLUGINS)
- plugin_metrics_provider_ = new PluginMetricsProvider(local_state);
-@@ -974,7 +974,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
- }
- #endif
+@@ -978,7 +978,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
#if defined(OS_WIN) || defined(OS_MAC) || \
-- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
// This creates the DesktopProfileSessionDurationsServices if it didn't exist
// already.
metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(