Index: chrome/browser/browser_process_platform_part_chromeos.cc |
diff --git a/chrome/browser/browser_process_platform_part_chromeos.cc b/chrome/browser/browser_process_platform_part_chromeos.cc |
index 7e6b13c441c341466141d96b0b599cf440be9279..b5debb4d90043751436396d355208c01fa5c0d48 100644 |
--- a/chrome/browser/browser_process_platform_part_chromeos.cc |
+++ b/chrome/browser/browser_process_platform_part_chromeos.cc |
@@ -19,6 +19,7 @@ |
#include "chrome/browser/chromeos/system/device_disabling_manager.h" |
#include "chrome/browser/chromeos/system/device_disabling_manager_default_delegate.h" |
#include "chrome/browser/chromeos/system/system_clock.h" |
+#include "chrome/browser/chromeos/system/timezone_resolver_manager.h" |
#include "chrome/browser/chromeos/system/timezone_util.h" |
#include "chrome/browser/lifetime/keep_alive_types.h" |
#include "chrome/browser/lifetime/scoped_keep_alive.h" |
@@ -117,9 +118,19 @@ BrowserProcessPlatformPart::browser_policy_connector_chromeos() { |
g_browser_process->browser_policy_connector()); |
} |
+chromeos::system::TimeZoneResolverManager* |
+BrowserProcessPlatformPart::GetTimezoneResolverManager() { |
+ if (!timezone_resolver_manager_.get()) { |
+ timezone_resolver_manager_.reset( |
+ new chromeos::system::TimeZoneResolverManager()); |
+ } |
+ return timezone_resolver_manager_.get(); |
+} |
+ |
chromeos::TimeZoneResolver* BrowserProcessPlatformPart::GetTimezoneResolver() { |
if (!timezone_resolver_.get()) { |
timezone_resolver_.reset(new chromeos::TimeZoneResolver( |
+ GetTimezoneResolverManager(), |
g_browser_process->system_request_context(), |
chromeos::SimpleGeolocationProvider::DefaultGeolocationProviderURL(), |
base::Bind(&chromeos::system::ApplyTimeZone), |