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

Side by Side Diff: chrome/browser/chromeos/settings/system_settings_provider.cc

Issue 11369258: Revert 167808 - Get rid of use of CreateStringValue in chromeos/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/settings/system_settings_provider.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/settings/system_settings_provider.h" 5 #include "chrome/browser/chromeos/settings/system_settings_provider.h"
6 6
7 #include "base/string16.h" 7 #include "base/string16.h"
8 #include "base/time.h" 8 #include "base/time.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/login/user_manager.h" 10 #include "chrome/browser/chromeos/login/user_manager.h"
11 #include "chrome/browser/chromeos/settings/cros_settings.h" 11 #include "chrome/browser/chromeos/settings/cros_settings.h"
12 #include "chrome/browser/chromeos/settings/cros_settings_names.h" 12 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
15 15
16 namespace chromeos { 16 namespace chromeos {
17 17
18 SystemSettingsProvider::SystemSettingsProvider( 18 SystemSettingsProvider::SystemSettingsProvider(
19 const NotifyObserversCallback& notify_cb) 19 const NotifyObserversCallback& notify_cb)
20 : CrosSettingsProvider(notify_cb) { 20 : CrosSettingsProvider(notify_cb) {
21 system::TimezoneSettings *timezone_settings = 21 system::TimezoneSettings *timezone_settings =
22 system::TimezoneSettings::GetInstance(); 22 system::TimezoneSettings::GetInstance();
23 timezone_settings->AddObserver(this); 23 timezone_settings->AddObserver(this);
24 timezone_value_.reset(new base::StringValue( 24 timezone_value_.reset(base::Value::CreateStringValue(
25 timezone_settings->GetCurrentTimezoneID())); 25 timezone_settings->GetCurrentTimezoneID()));
26 } 26 }
27 27
28 SystemSettingsProvider::~SystemSettingsProvider() { 28 SystemSettingsProvider::~SystemSettingsProvider() {
29 system::TimezoneSettings::GetInstance()->RemoveObserver(this); 29 system::TimezoneSettings::GetInstance()->RemoveObserver(this);
30 } 30 }
31 31
32 void SystemSettingsProvider::DoSet(const std::string& path, 32 void SystemSettingsProvider::DoSet(const std::string& path,
33 const base::Value& in_value) { 33 const base::Value& in_value) {
34 // Non-guest users can change the time zone. 34 // Non-guest users can change the time zone.
(...skipping 20 matching lines...) Expand all
55 SystemSettingsProvider::PrepareTrustedValues(const base::Closure& cb) { 55 SystemSettingsProvider::PrepareTrustedValues(const base::Closure& cb) {
56 return TRUSTED; 56 return TRUSTED;
57 } 57 }
58 58
59 bool SystemSettingsProvider::HandlesSetting(const std::string& path) const { 59 bool SystemSettingsProvider::HandlesSetting(const std::string& path) const {
60 return path == kSystemTimezone; 60 return path == kSystemTimezone;
61 } 61 }
62 62
63 void SystemSettingsProvider::TimezoneChanged(const icu::TimeZone& timezone) { 63 void SystemSettingsProvider::TimezoneChanged(const icu::TimeZone& timezone) {
64 // Fires system setting change notification. 64 // Fires system setting change notification.
65 timezone_value_.reset(new base::StringValue( 65 timezone_value_.reset(base::Value::CreateStringValue(
66 system::TimezoneSettings::GetTimezoneID(timezone))); 66 system::TimezoneSettings::GetTimezoneID(timezone)));
67 NotifyObservers(kSystemTimezone); 67 NotifyObservers(kSystemTimezone);
68 } 68 }
69 69
70 } // namespace chromeos 70 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/settings/system_settings_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698