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

Side by Side Diff: chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h

Issue 790183002: Revert of Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpda... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FACTOR Y_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FACTOR Y_H_
6 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FACTOR Y_H_ 6 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FACTOR Y_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
12 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 12 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
13 13
14 class KeyedService; 14 class KeyedService;
15 15 class Profile;
16 namespace content {
17 class BrowserContext;
18 }
19 16
20 namespace ownership { 17 namespace ownership {
21 class OwnerKeyUtil; 18 class OwnerKeyUtil;
22 } 19 }
23 20
24 namespace chromeos { 21 namespace chromeos {
25 22
26 class DeviceSettingsService; 23 class DeviceSettingsService;
27 class OwnerSettingsServiceChromeOS; 24 class OwnerSettingsServiceChromeOS;
28 25
29 class OwnerSettingsServiceChromeOSFactory 26 class OwnerSettingsServiceChromeOSFactory
30 : public BrowserContextKeyedServiceFactory { 27 : public BrowserContextKeyedServiceFactory {
31 public: 28 public:
32 static OwnerSettingsServiceChromeOS* GetForBrowserContext( 29 static OwnerSettingsServiceChromeOS* GetForProfile(Profile* profile);
33 content::BrowserContext* context);
34 30
35 static OwnerSettingsServiceChromeOSFactory* GetInstance(); 31 static OwnerSettingsServiceChromeOSFactory* GetInstance();
36 32
37 static void SetDeviceSettingsServiceForTesting( 33 static void SetDeviceSettingsServiceForTesting(
38 DeviceSettingsService* device_settings_service); 34 DeviceSettingsService* device_settings_service);
39 35
40 scoped_refptr<ownership::OwnerKeyUtil> GetOwnerKeyUtil(); 36 scoped_refptr<ownership::OwnerKeyUtil> GetOwnerKeyUtil();
41 37
42 void SetOwnerKeyUtilForTesting( 38 void SetOwnerKeyUtilForTesting(
43 const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util); 39 const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
(...skipping 14 matching lines...) Expand all
58 content::BrowserContext* browser_context) const override; 54 content::BrowserContext* browser_context) const override;
59 55
60 scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_; 56 scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
61 57
62 DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSFactory); 58 DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSFactory);
63 }; 59 };
64 60
65 } // namespace chromeos 61 } // namespace chromeos
66 62
67 #endif // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FAC TORY_H_ 63 #endif // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FAC TORY_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698