Chromium Code Reviews| 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 4f343f9bd24f434dfbe4e46067bef984d837cd12..ef0a627e869e12662296f56185abbca77efafd08 100644 |
| --- a/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc |
| +++ b/chrome/browser/ui/webui/options/chromeos/system_options_handler.cc |
| @@ -15,6 +15,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" |
| @@ -30,9 +31,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() { |
| @@ -80,9 +79,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. |
|
Mattias Nissler (ping if slow)
2011/09/26 17:26:37
haven't you included that list handling already no
pastarmovj
2011/09/29 15:15:03
I'd rather fix this in a separate CL.
|
| 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() { |