Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4961)

Unified Diff: chrome/browser/ui/webui/options/chromeos/system_options_handler.cc

Issue 7867044: PART1: Initiated the SignedSettings refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased on ToT (solved merging conflict). Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a9a1d135debd891f8ba9f1e888acdb9a28204a8d..ba21245ee158f3f891a6d862c55ac14a7e935e0f 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/browser/tab_contents/tab_contents.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/dbus/dbus_thread_manager.h"
#include "chrome/browser/chromeos/dbus/power_manager_client.h"
#include "chrome/browser/chromeos/language_preferences.h"
@@ -46,9 +47,7 @@ void TouchpadExistsFileThread(bool* exists) {
}
-SystemOptionsHandler::SystemOptionsHandler()
- : chromeos::CrosOptionsPageUIHandler(
- new chromeos::SystemSettingsProvider()) {
+SystemOptionsHandler::SystemOptionsHandler() {
}
SystemOptionsHandler::~SystemOptionsHandler() {
@@ -105,9 +104,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() {

Powered by Google App Engine
This is Rietveld 408576698