| Index: chrome/browser/ui/webui/options/browser_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| index d230ca7c1ebe03bb3db3c3a49e5d52ee07b86f6b..06349797d8ad01d0a0fbd08a5c42837b9a5100e0 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -505,6 +505,10 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| { "cloudPrintEnableNotificationsLabel",
|
| IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL },
|
| #endif
|
| +#if defined(OS_CHROMEOS)
|
| + { "resolveTimezoneByGeoLocation",
|
| + IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION },
|
| +#endif
|
| };
|
|
|
| #if defined(ENABLE_SETTINGS_APP)
|
| @@ -672,6 +676,12 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| "showWakeOnWifi",
|
| chromeos::WakeOnWifiManager::Get()->WakeOnWifiSupported() &&
|
| chromeos::switches::WakeOnWifiEnabled());
|
| + const bool have_enable_time_zone_tracking_option_switch =
|
| + base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + chromeos::switches::kEnableTimeZoneTrackingOption);
|
| + values->SetBoolean("enableTimeZoneTrackingOption",
|
| + have_enable_time_zone_tracking_option_switch &&
|
| + !chromeos::system::HasSystemTimezonePolicy());
|
| #endif
|
| }
|
|
|
| @@ -957,6 +967,10 @@ void BrowserOptionsHandler::InitializeHandler() {
|
| base::Bind(&BrowserOptionsHandler::OnWallpaperPolicyChanged,
|
| base::Unretained(this)));
|
| }
|
| + chromeos::CrosSettings::Get()->AddSettingsObserver(
|
| + chromeos::kSystemTimezonePolicy,
|
| + base::Bind(&BrowserOptionsHandler::OnSystemTimezonePolicyChanged,
|
| + weak_ptr_factory_.GetWeakPtr()));
|
| #else // !defined(OS_CHROMEOS)
|
| profile_pref_registrar_.Add(
|
| prefs::kProxy,
|
| @@ -1416,6 +1430,12 @@ void BrowserOptionsHandler::OnWallpaperManagedChanged(bool managed) {
|
| web_ui()->CallJavascriptFunction("BrowserOptions.setWallpaperManaged",
|
| base::FundamentalValue(managed));
|
| }
|
| +
|
| +void BrowserOptionsHandler::OnSystemTimezonePolicyChanged() {
|
| + web_ui()->CallJavascriptFunction(
|
| + "BrowserOptions.setSystemTimezoneManaged",
|
| + base::FundamentalValue(chromeos::system::HasSystemTimezonePolicy()));
|
| +}
|
| #endif
|
|
|
| scoped_ptr<base::DictionaryValue>
|
|
|