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

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

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_
6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_ 6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/callback.h" 11 #include "base/callback.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "chromeos/settings/cros_settings_provider.h" 13 #include "chromeos/settings/cros_settings_provider.h"
14 #include "chromeos/settings/timezone_settings.h" 14 #include "chromeos/settings/timezone_settings.h"
15 #include "third_party/icu/source/i18n/unicode/timezone.h" 15 #include "third_party/icu/source/i18n/unicode/timezone.h"
16 16
17 namespace base { 17 namespace base {
18 class StringValue; 18 class StringValue;
19 } 19 }
20 20
21 namespace chromeos { 21 namespace chromeos {
22 22
23 class SystemSettingsProvider : public CrosSettingsProvider, 23 class SystemSettingsProvider : public CrosSettingsProvider,
24 public system::TimezoneSettings::Observer { 24 public system::TimezoneSettings::Observer {
25 public: 25 public:
26 explicit SystemSettingsProvider(const NotifyObserversCallback& notify_cb); 26 explicit SystemSettingsProvider(const NotifyObserversCallback& notify_cb);
27 ~SystemSettingsProvider() override; 27 ~SystemSettingsProvider() override;
28 28
29 // CrosSettingsProvider implementation. 29 // CrosSettingsProvider implementation.
30 const base::Value* Get(const std::string& path) const override; 30 const base::Value* Get(const std::string& path) const override;
31 TrustedStatus PrepareTrustedValues(const base::Closure& callback) override; 31 TrustedStatus PrepareTrustedValues(const base::Closure& callback) override;
32 bool HandlesSetting(const std::string& path) const override; 32 bool HandlesSetting(const std::string& path) const override;
33 33
34 // TimezoneSettings::Observer implementation. 34 // TimezoneSettings::Observer implementation.
35 void TimezoneChanged(const icu::TimeZone& timezone) override; 35 void TimezoneChanged(const icu::TimeZone& timezone) override;
36 36
37 private: 37 private:
38 // CrosSettingsProvider implementation. 38 // CrosSettingsProvider implementation.
39 void DoSet(const std::string& path, const base::Value& in_value) override; 39 void DoSet(const std::string& path, const base::Value& in_value) override;
40 40
41 scoped_ptr<base::StringValue> timezone_value_; 41 std::unique_ptr<base::StringValue> timezone_value_;
42 42
43 DISALLOW_COPY_AND_ASSIGN(SystemSettingsProvider); 43 DISALLOW_COPY_AND_ASSIGN(SystemSettingsProvider);
44 }; 44 };
45 45
46 } // namespace chromeos 46 } // namespace chromeos
47 47
48 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_ 48 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698