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

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

Issue 8899002: [cros] Add --stub-cros-settings option for testing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years 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
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/system_settings_provider.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
index 815dc49418cedaf585e0706fee2ab4f4a60812b4..003fad2a80cab6ce5f59d42557d0d1ea739b2575 100644
--- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
+++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
@@ -183,7 +183,9 @@ string16 GetExemplarCity(const icu::TimeZone& zone) {
namespace chromeos {
-SystemSettingsProvider::SystemSettingsProvider() {
+SystemSettingsProvider::SystemSettingsProvider(
+ const NotifyObserversCallback& notify_cb)
+ : CrosSettingsProvider(notify_cb) {
for (size_t i = 0; i < arraysize(kTimeZones); i++) {
timezones_.push_back(icu::TimeZone::createTimeZone(
icu::UnicodeString(kTimeZones[i], -1, US_INV)));
@@ -242,7 +244,7 @@ void SystemSettingsProvider::TimezoneChanged(const icu::TimeZone& timezone) {
// Fires system setting change notification.
timezone_value_.reset(
base::Value::CreateStringValue(GetKnownTimezoneID(timezone)));
- CrosSettings::Get()->FireObservers(kSystemTimezone);
+ NotifyObservers(kSystemTimezone);
}
ListValue* SystemSettingsProvider::GetTimezoneList() {
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/system_settings_provider.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698