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

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

Issue 516243002: Instantiation of OwnerKeyUtil is delegated to OwnerSettingsServiceFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years, 3 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_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_FACTORY_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_FACTORY_H_
6 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_FACTORY_H_ 6 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_FACTORY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ref_counted.h"
12 #include "base/memory/singleton.h" 13 #include "base/memory/singleton.h"
13 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 14 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
15 #include "components/ownership/owner_key_util.h"
erikwright (departed) 2014/09/03 14:07:16 nit: you should be able to forward-decl this now.
ygorshenin1 2014/09/04 07:35:53 Done.
14 16
15 class KeyedService; 17 class KeyedService;
16 class Profile; 18 class Profile;
17 19
18 namespace chromeos { 20 namespace chromeos {
19 21
20 class OwnerSettingsService; 22 class OwnerSettingsService;
21 23
22 class OwnerSettingsServiceFactory : public BrowserContextKeyedServiceFactory { 24 class OwnerSettingsServiceFactory : public BrowserContextKeyedServiceFactory {
23 public: 25 public:
24 static OwnerSettingsService* GetForProfile(Profile* profile); 26 static OwnerSettingsService* GetForProfile(Profile* profile);
25 27
26 static OwnerSettingsServiceFactory* GetInstance(); 28 static OwnerSettingsServiceFactory* GetInstance();
27 29
30 scoped_refptr<ownership::OwnerKeyUtil> GetOwnerKeyUtil();
31
32 void SetOwnerKeyUtilForTesting(
33 const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
34
28 private: 35 private:
29 friend struct DefaultSingletonTraits<OwnerSettingsServiceFactory>; 36 friend struct DefaultSingletonTraits<OwnerSettingsServiceFactory>;
30 37
31 OwnerSettingsServiceFactory(); 38 OwnerSettingsServiceFactory();
32 virtual ~OwnerSettingsServiceFactory(); 39 virtual ~OwnerSettingsServiceFactory();
33 40
34 static KeyedService* BuildInstanceFor(content::BrowserContext* context); 41 static KeyedService* BuildInstanceFor(content::BrowserContext* context);
35 42
36 // BrowserContextKeyedBaseFactory overrides: 43 // BrowserContextKeyedBaseFactory overrides:
37 virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; 44 virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
38 45
39 // BrowserContextKeyedServiceFactory implementation: 46 // BrowserContextKeyedServiceFactory implementation:
40 virtual KeyedService* BuildServiceInstanceFor( 47 virtual KeyedService* BuildServiceInstanceFor(
41 content::BrowserContext* browser_context) const OVERRIDE; 48 content::BrowserContext* browser_context) const OVERRIDE;
42 49
50 scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
51
43 DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceFactory); 52 DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceFactory);
44 }; 53 };
45 54
46 } // namespace chromeos 55 } // namespace chromeos
47 56
48 #endif // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_FACTORY_H_ 57 #endif // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698