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

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

Issue 738843002: Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpdaterCros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years, 1 month 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 class Profile; 15
16 namespace content {
17 class BrowserContext;
18 }
16 19
17 namespace ownership { 20 namespace ownership {
18 class OwnerKeyUtil; 21 class OwnerKeyUtil;
19 } 22 }
20 23
21 namespace chromeos { 24 namespace chromeos {
22 25
23 class DeviceSettingsService; 26 class DeviceSettingsService;
24 class OwnerSettingsServiceChromeOS; 27 class OwnerSettingsServiceChromeOS;
25 28
26 class OwnerSettingsServiceChromeOSFactory 29 class OwnerSettingsServiceChromeOSFactory
27 : public BrowserContextKeyedServiceFactory { 30 : public BrowserContextKeyedServiceFactory {
28 public: 31 public:
29 static OwnerSettingsServiceChromeOS* GetForProfile(Profile* profile); 32 static OwnerSettingsServiceChromeOS* GetForBrowserContext(
33 content::BrowserContext* context);
30 34
31 static OwnerSettingsServiceChromeOSFactory* GetInstance(); 35 static OwnerSettingsServiceChromeOSFactory* GetInstance();
32 36
33 static void SetDeviceSettingsServiceForTesting( 37 static void SetDeviceSettingsServiceForTesting(
34 DeviceSettingsService* device_settings_service); 38 DeviceSettingsService* device_settings_service);
35 39
36 scoped_refptr<ownership::OwnerKeyUtil> GetOwnerKeyUtil(); 40 scoped_refptr<ownership::OwnerKeyUtil> GetOwnerKeyUtil();
37 41
38 void SetOwnerKeyUtilForTesting( 42 void SetOwnerKeyUtilForTesting(
39 const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util); 43 const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
(...skipping 14 matching lines...) Expand all
54 content::BrowserContext* browser_context) const override; 58 content::BrowserContext* browser_context) const override;
55 59
56 scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_; 60 scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
57 61
58 DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSFactory); 62 DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSFactory);
59 }; 63 };
60 64
61 } // namespace chromeos 65 } // namespace chromeos
62 66
63 #endif // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FAC TORY_H_ 67 #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