aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc')
-rw-r--r--www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
index 86452c411db5..1527d9ee5540 100644
--- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
+++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
@@ -1,11 +1,11 @@
---- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2017-09-05 21:05:23.000000000 +0200
-+++ services/device/time_zone_monitor/time_zone_monitor.cc 2017-09-06 21:23:20.120961000 +0200
+--- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2018-12-03 21:17:09.000000000 +0100
++++ services/device/time_zone_monitor/time_zone_monitor.cc 2018-12-14 00:48:16.376188000 +0100
@@ -41,7 +41,7 @@
#else
std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::detectHostTimeZone());
#endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) && !defined(IS_CHROMECAST)
++#if (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
// We get here multiple times on Linux per a single tz change, but
// want to update the ICU default zone and notify renderer only once.
std::unique_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());