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

Side by Side Diff: chrome/browser/extensions/install_tracker_factory.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional cleanup Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "chrome/browser/extensions/install_tracker_factory.h" 5 #include "chrome/browser/extensions/install_tracker_factory.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/extension_system_factory.h" 8 #include "chrome/browser/extensions/extension_system_factory.h"
10 #include "chrome/browser/extensions/install_tracker.h" 9 #include "chrome/browser/extensions/install_tracker.h"
11 #include "chrome/browser/profiles/incognito_helpers.h" 10 #include "chrome/browser/profiles/incognito_helpers.h"
12 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
13 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h" 12 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"
13 #include "extensions/browser/extension_prefs.h"
14 #include "extensions/browser/extension_prefs_factory.h"
14 #include "extensions/browser/extension_system.h" 15 #include "extensions/browser/extension_system.h"
15 16
16 namespace extensions { 17 namespace extensions {
17 18
18 // static 19 // static
19 InstallTracker* InstallTrackerFactory::GetForProfile(Profile* profile) { 20 InstallTracker* InstallTrackerFactory::GetForProfile(Profile* profile) {
20 return static_cast<InstallTracker*>( 21 return static_cast<InstallTracker*>(
21 GetInstance()->GetServiceForBrowserContext(profile, true)); 22 GetInstance()->GetServiceForBrowserContext(profile, true));
22 } 23 }
23 24
24 InstallTrackerFactory* InstallTrackerFactory::GetInstance() { 25 InstallTrackerFactory* InstallTrackerFactory::GetInstance() {
25 return Singleton<InstallTrackerFactory>::get(); 26 return Singleton<InstallTrackerFactory>::get();
26 } 27 }
27 28
28 InstallTrackerFactory::InstallTrackerFactory() 29 InstallTrackerFactory::InstallTrackerFactory()
29 : BrowserContextKeyedServiceFactory( 30 : BrowserContextKeyedServiceFactory(
30 "InstallTracker", 31 "InstallTracker",
31 BrowserContextDependencyManager::GetInstance()) { 32 BrowserContextDependencyManager::GetInstance()) {
32 DependsOn(ExtensionSystemFactory::GetInstance()); 33 DependsOn(ExtensionSystemFactory::GetInstance());
34 DependsOn(ExtensionPrefsFactory::GetInstance());
33 } 35 }
34 36
35 InstallTrackerFactory::~InstallTrackerFactory() { 37 InstallTrackerFactory::~InstallTrackerFactory() {
36 } 38 }
37 39
38 BrowserContextKeyedService* InstallTrackerFactory::BuildServiceInstanceFor( 40 BrowserContextKeyedService* InstallTrackerFactory::BuildServiceInstanceFor(
39 content::BrowserContext* context) const { 41 content::BrowserContext* context) const {
40 Profile* profile = static_cast<Profile*>(context); 42 Profile* profile = static_cast<Profile*>(context);
41 ExtensionService* service = 43 return new InstallTracker(profile, ExtensionPrefs::Get(context));
42 extensions::ExtensionSystem::Get(profile)->extension_service();
43 return new InstallTracker(profile, service->extension_prefs());
44 } 44 }
45 45
46 content::BrowserContext* InstallTrackerFactory::GetBrowserContextToUse( 46 content::BrowserContext* InstallTrackerFactory::GetBrowserContextToUse(
47 content::BrowserContext* context) const { 47 content::BrowserContext* context) const {
48 // The installs themselves are routed to the non-incognito profile and so 48 // The installs themselves are routed to the non-incognito profile and so
49 // should the install progress. 49 // should the install progress.
50 return chrome::GetBrowserContextRedirectedInIncognito(context); 50 return chrome::GetBrowserContextRedirectedInIncognito(context);
51 } 51 }
52 52
53 } // namespace extensions 53 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698