| Index: chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
|
| index 362fa82b08ba652ce73d3402c530f0d04eb8b0cc..44792a8e527daffff343090520bf42751b58ca11 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc
|
| @@ -17,6 +17,7 @@
|
| #include "content/common/json_value_serializer.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/chromeos/accessibility_util.h"
|
| +#include "chrome/browser/chromeos/cros_settings.h"
|
| #include "chrome/browser/chromeos/language_preferences.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| @@ -33,9 +34,7 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| -SystemOptionsHandler::SystemOptionsHandler()
|
| - : chromeos::CrosOptionsPageUIHandler(
|
| - new chromeos::SystemSettingsProvider()) {
|
| +SystemOptionsHandler::SystemOptionsHandler() {
|
| }
|
|
|
| SystemOptionsHandler::~SystemOptionsHandler() {
|
| @@ -90,9 +89,12 @@ void SystemOptionsHandler::GetLocalizedValues(
|
| l10n_util::GetStringUTF16(
|
| IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION));
|
|
|
| + // TODO(pastarmovj): replace this with a call to the CrosSettings list
|
| + // handling functionality to come.
|
| localized_strings->Set("timezoneList",
|
| - reinterpret_cast<chromeos::SystemSettingsProvider*>(
|
| - settings_provider_.get())->GetTimezoneList());
|
| + static_cast<chromeos::SystemSettingsProvider*>(
|
| + chromeos::CrosSettings::Get()->GetProvider(
|
| + chromeos::kSystemTimezone))->GetTimezoneList());
|
| }
|
|
|
| void SystemOptionsHandler::Initialize() {
|
|
|