Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-updates-src > by-pkgid > a9b1d67ad041f7d57d9131842bd45d4c > files > 3

chromium-browser-stable-55.0.2883.87-1.mga5.src.rpm

--- chromium-55.0.2883.75/device/time_zone_monitor/time_zone_monitor.cc.orig	2016-12-09 00:08:30.030000000 +0100
+++ chromium-55.0.2883.75/device/time_zone_monitor/time_zone_monitor.cc	2016-12-09 00:11:02.170000000 +0100
@@ -25,24 +25,11 @@
 
 void TimeZoneMonitor::NotifyClients() {
   DCHECK(thread_checker_.CalledOnValidThread());
-#if defined(OS_CHROMEOS)
   // On CrOS, ICU's default tz is already set to a new zone. No
   // need to redetect it with detectHostTimeZone().
+  
+  // Use CrOS code for icu53 which does not have detectHostTimeZone()
   std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
-#else
-  icu::TimeZone* new_zone = icu::TimeZone::detectHostTimeZone();
-#if defined(OS_LINUX)
-  // 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());
-  if (*current_zone == *new_zone) {
-    VLOG(1) << "timezone already updated";
-    delete new_zone;
-    return;
-  }
-#endif
-  icu::TimeZone::adoptDefault(new_zone);
-#endif
   icu::UnicodeString zone_id;
   std::string zone_id_str;
   new_zone->getID(zone_id).toUTF8String(zone_id_str);