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

Side by Side Diff: chrome/browser/chromeos/power/power_prefs.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_POWER_POWER_PREFS_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POWER_POWER_PREFS_H_
6 #define CHROME_BROWSER_CHROMEOS_POWER_POWER_PREFS_H_ 6 #define CHROME_BROWSER_CHROMEOS_POWER_POWER_PREFS_H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "content/public/browser/notification_observer.h" 12 #include "content/public/browser/notification_observer.h"
12 #include "content/public/browser/notification_registrar.h" 13 #include "content/public/browser/notification_registrar.h"
13 14
14 class PrefChangeRegistrar; 15 class PrefChangeRegistrar;
15 class Profile; 16 class Profile;
16 17
17 namespace user_prefs { 18 namespace user_prefs {
18 class PrefRegistrySyncable; 19 class PrefRegistrySyncable;
19 } 20 }
20 21
(...skipping 30 matching lines...) Expand all
51 // the login profile. 52 // the login profile.
52 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 53 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
53 54
54 void SetProfile(Profile* profile); 55 void SetProfile(Profile* profile);
55 56
56 PowerPolicyController* power_policy_controller_; // Not owned. 57 PowerPolicyController* power_policy_controller_; // Not owned.
57 58
58 content::NotificationRegistrar notification_registrar_; 59 content::NotificationRegistrar notification_registrar_;
59 60
60 Profile* profile_; // Not owned. 61 Profile* profile_; // Not owned.
61 scoped_ptr<PrefChangeRegistrar> pref_change_registrar_; 62 std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
62 63
63 // True while the screen is locked (but not while the login screen is shown). 64 // True while the screen is locked (but not while the login screen is shown).
64 bool screen_is_locked_; 65 bool screen_is_locked_;
65 66
66 DISALLOW_COPY_AND_ASSIGN(PowerPrefs); 67 DISALLOW_COPY_AND_ASSIGN(PowerPrefs);
67 }; 68 };
68 69
69 } // namespace chromeos 70 } // namespace chromeos
70 71
71 #endif // CHROME_BROWSER_CHROMEOS_POWER_POWER_PREFS_H_ 72 #endif // CHROME_BROWSER_CHROMEOS_POWER_POWER_PREFS_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/power/power_button_observer.cc ('k') | chrome/browser/chromeos/power/power_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698