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

Side by Side Diff: chrome/browser/chromeos/system/system_clock.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_SYSTEM_SYSTEM_CLOCK_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_SYSTEM_CLOCK_H_
6 #define CHROME_BROWSER_CHROMEOS_SYSTEM_SYSTEM_CLOCK_H_ 6 #define CHROME_BROWSER_CHROMEOS_SYSTEM_SYSTEM_CLOCK_H_
7 7
8 #include <memory>
9
8 #include "base/callback_list.h" 10 #include "base/callback_list.h"
9 #include "base/i18n/time_formatting.h" 11 #include "base/i18n/time_formatting.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "chromeos/login/login_state.h" 13 #include "chromeos/login/login_state.h"
13 #include "components/user_manager/user_manager.h" 14 #include "components/user_manager/user_manager.h"
14 #include "content/public/browser/notification_observer.h" 15 #include "content/public/browser/notification_observer.h"
15 #include "content/public/browser/notification_registrar.h" 16 #include "content/public/browser/notification_registrar.h"
16 17
17 class Profile; 18 class Profile;
18 class PrefChangeRegistrar; 19 class PrefChangeRegistrar;
19 20
20 namespace user_manager { 21 namespace user_manager {
21 class User; 22 class User;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 void LoggedInStateChanged() override; 67 void LoggedInStateChanged() override;
67 68
68 void OnSystemPrefChanged(); 69 void OnSystemPrefChanged();
69 70
70 void UpdateClockType(); 71 void UpdateClockType();
71 72
72 bool user_pod_was_focused_; 73 bool user_pod_was_focused_;
73 base::HourClockType last_focused_pod_hour_clock_type_; 74 base::HourClockType last_focused_pod_hour_clock_type_;
74 75
75 Profile* user_profile_; 76 Profile* user_profile_;
76 scoped_ptr<content::NotificationRegistrar> registrar_; 77 std::unique_ptr<content::NotificationRegistrar> registrar_;
77 scoped_ptr<PrefChangeRegistrar> user_pref_registrar_; 78 std::unique_ptr<PrefChangeRegistrar> user_pref_registrar_;
78 79
79 base::ObserverList<SystemClockObserver> observer_list_; 80 base::ObserverList<SystemClockObserver> observer_list_;
80 81
81 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; 82 std::unique_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
82 83
83 DISALLOW_COPY_AND_ASSIGN(SystemClock); 84 DISALLOW_COPY_AND_ASSIGN(SystemClock);
84 }; 85 };
85 86
86 } // namespace system 87 } // namespace system
87 } // namespace chromeos 88 } // namespace chromeos
88 89
89 #endif // CHROME_BROWSER_CHROMEOS_SYSTEM_SYSTEM_CLOCK_H_ 90 #endif // CHROME_BROWSER_CHROMEOS_SYSTEM_SYSTEM_CLOCK_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/device_disabling_manager_unittest.cc ('k') | chrome/browser/chromeos/system/system_clock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698