Chromium Code Reviews| 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..23d9129be750aab81c3280c79a7fbfce90b6a40e 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,10 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { |
| "showWakeOnWifi", |
| chromeos::WakeOnWifiManager::Get()->WakeOnWifiSupported() && |
| chromeos::switches::WakeOnWifiEnabled()); |
| + values->SetBoolean("enableTimeZoneTrackingOption", |
| + base::CommandLine::ForCurrentProcess()->HasSwitch( |
| + chromeos::switches::kEnableTimeZoneTracking) && |
| + !chromeos::system::HasSystemTimezonePolicy()); |
|
stevenjb
2015/01/05 17:34:21
nit: use a temporary here to improve readability.
Alexander Alekseev
2015/01/15 18:59:02
Done.
|
| #endif |
| } |
| @@ -957,6 +965,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 +1428,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> |