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

Side by Side Diff: chrome/browser/supervised_user/legacy/supervised_user_pref_mapping_service.h

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SUPERVISED_USER_LEGACY_SUPERVISED_USER_PREF_MAPPING_SERVI CE_H_ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_LEGACY_SUPERVISED_USER_PREF_MAPPING_SERVI CE_H_
6 #define CHROME_BROWSER_SUPERVISED_USER_LEGACY_SUPERVISED_USER_PREF_MAPPING_SERVI CE_H_ 6 #define CHROME_BROWSER_SUPERVISED_USER_LEGACY_SUPERVISED_USER_PREF_MAPPING_SERVI CE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/callback_list.h" 9 #include "base/callback_list.h"
10 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
12 #include "base/prefs/pref_change_registrar.h" 13 #include "base/prefs/pref_change_registrar.h"
13 #include "chrome/browser/supervised_user/supervised_users.h" 14 #include "chrome/browser/supervised_user/supervised_users.h"
14 #include "components/keyed_service/core/keyed_service.h" 15 #include "components/keyed_service/core/keyed_service.h"
15 16
16 class PrefService; 17 class PrefService;
17 class SupervisedUserSharedSettingsService; 18 class SupervisedUserSharedSettingsService;
18 19
19 // SupervisedUserPrefMappingService maps shared supervised user settings to user 20 // SupervisedUserPrefMappingService maps shared supervised user settings to user
(...skipping 30 matching lines...) Expand all
50 SupervisedUserSharedSettingsService* shared_settings_; 51 SupervisedUserSharedSettingsService* shared_settings_;
51 scoped_ptr<CallbackList::Subscription> subscription_; 52 scoped_ptr<CallbackList::Subscription> subscription_;
52 std::string supervised_user_id_; 53 std::string supervised_user_id_;
53 PrefChangeRegistrar pref_change_registrar_; 54 PrefChangeRegistrar pref_change_registrar_;
54 base::WeakPtrFactory<SupervisedUserPrefMappingService> weak_ptr_factory_; 55 base::WeakPtrFactory<SupervisedUserPrefMappingService> weak_ptr_factory_;
55 56
56 DISALLOW_COPY_AND_ASSIGN(SupervisedUserPrefMappingService); 57 DISALLOW_COPY_AND_ASSIGN(SupervisedUserPrefMappingService);
57 }; 58 };
58 59
59 #endif // CHROME_BROWSER_SUPERVISED_USER_LEGACY_SUPERVISED_USER_PREF_MAPPING_SE RVICE_H_ 60 #endif // CHROME_BROWSER_SUPERVISED_USER_LEGACY_SUPERVISED_USER_PREF_MAPPING_SE RVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698