| 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 6a632f3ef04f57220057991268207d3c6a83d526..7488037c872cf2c9de4087596487a7383f9244a1 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -719,12 +719,8 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| "showWakeOnWifi",
|
| chromeos::WakeOnWifiManager::Get()->WakeOnWifiSupported() &&
|
| chromeos::switches::WakeOnWifiEnabled());
|
| - const bool have_disable_time_zone_tracking_option_switch =
|
| - base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - chromeos::switches::kDisableTimeZoneTrackingOption);
|
| values->SetBoolean("enableTimeZoneTrackingOption",
|
| - !have_disable_time_zone_tracking_option_switch &&
|
| - !chromeos::system::HasSystemTimezonePolicy());
|
| + !chromeos::system::HasSystemTimezonePolicy());
|
| values->SetBoolean("resolveTimezoneByGeolocationInitialValue",
|
| Profile::FromWebUI(web_ui())->GetPrefs()->GetBoolean(
|
| prefs::kResolveTimezoneByGeolocation));
|
|
|