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

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

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 months 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
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/strings/string16.h" 7 #include "base/strings/string16.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chromeos/login/login_state.h" 10 #include "chromeos/login/login_state.h"
11 #include "chromeos/settings/cros_settings_names.h" 11 #include "chromeos/settings/cros_settings_names.h"
12 12
13 namespace chromeos { 13 namespace chromeos {
14 14
15 SystemSettingsProvider::SystemSettingsProvider( 15 SystemSettingsProvider::SystemSettingsProvider(
16 const NotifyObserversCallback& notify_cb) 16 const NotifyObserversCallback& notify_cb)
17 : CrosSettingsProvider(notify_cb) { 17 : CrosSettingsProvider(notify_cb) {
18 system::TimezoneSettings *timezone_settings = 18 system::TimezoneSettings *timezone_settings =
19 system::TimezoneSettings::GetInstance(); 19 system::TimezoneSettings::GetInstance();
20 timezone_settings->AddObserver(this); 20 timezone_settings->AddObserver(this);
21 timezone_value_.reset(new base::StringValue( 21 timezone_value_.reset(
22 timezone_settings->GetCurrentTimezoneID())); 22 new base::Value(timezone_settings->GetCurrentTimezoneID()));
23 } 23 }
24 24
25 SystemSettingsProvider::~SystemSettingsProvider() { 25 SystemSettingsProvider::~SystemSettingsProvider() {
26 system::TimezoneSettings::GetInstance()->RemoveObserver(this); 26 system::TimezoneSettings::GetInstance()->RemoveObserver(this);
27 } 27 }
28 28
29 void SystemSettingsProvider::DoSet(const std::string& path, 29 void SystemSettingsProvider::DoSet(const std::string& path,
30 const base::Value& in_value) { 30 const base::Value& in_value) {
31 // Only non-guest users can change the time zone. 31 // Only non-guest users can change the time zone.
32 if (LoginState::Get()->IsGuestSessionUser() || 32 if (LoginState::Get()->IsGuestSessionUser() ||
(...skipping 21 matching lines...) Expand all
54 SystemSettingsProvider::PrepareTrustedValues(const base::Closure& cb) { 54 SystemSettingsProvider::PrepareTrustedValues(const base::Closure& cb) {
55 return TRUSTED; 55 return TRUSTED;
56 } 56 }
57 57
58 bool SystemSettingsProvider::HandlesSetting(const std::string& path) const { 58 bool SystemSettingsProvider::HandlesSetting(const std::string& path) const {
59 return path == kSystemTimezone; 59 return path == kSystemTimezone;
60 } 60 }
61 61
62 void SystemSettingsProvider::TimezoneChanged(const icu::TimeZone& timezone) { 62 void SystemSettingsProvider::TimezoneChanged(const icu::TimeZone& timezone) {
63 // Fires system setting change notification. 63 // Fires system setting change notification.
64 timezone_value_.reset(new base::StringValue( 64 timezone_value_.reset(
65 system::TimezoneSettings::GetTimezoneID(timezone))); 65 new base::Value(system::TimezoneSettings::GetTimezoneID(timezone)));
66 NotifyObservers(kSystemTimezone); 66 NotifyObservers(kSystemTimezone);
67 } 67 }
68 68
69 } // namespace chromeos 69 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698