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

Side by Side Diff: apps/shell/shell_extensions_browser_client.cc

Issue 131743021: app_shell: Extract extension runtime data from ExtensionService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, RuntimeDataTest tweak, win warning Created 6 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "apps/shell/shell_extensions_browser_client.h" 5 #include "apps/shell/shell_extensions_browser_client.h"
6 6
7 #include "apps/shell/shell_app_sorting.h" 7 #include "apps/shell/shell_app_sorting.h"
8 #include "apps/shell/shell_extension_system.h" 8 #include "apps/shell/shell_extension_system.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/prefs/pref_service_factory.h" 10 #include "base/prefs/pref_service_factory.h"
11 #include "base/prefs/testing_pref_store.h" 11 #include "base/prefs/testing_pref_store.h"
12 #include "components/user_prefs/pref_registry_syncable.h" 12 #include "components/user_prefs/pref_registry_syncable.h"
13 #include "components/user_prefs/user_prefs.h" 13 #include "components/user_prefs/user_prefs.h"
14 #include "extensions/browser/app_sorting.h" 14 #include "extensions/browser/app_sorting.h"
15 #include "extensions/browser/extension_prefs.h" 15 #include "extensions/browser/extension_prefs.h"
16 #include "extensions/browser/extension_prefs_factory.h" 16 #include "extensions/browser/extension_prefs_factory.h"
17 #include "extensions/browser/extension_registry_factory.h"
17 18
18 using content::BrowserContext; 19 using content::BrowserContext;
19 20
20 namespace extensions { 21 namespace extensions {
21 namespace { 22 namespace {
22 23
23 // See chrome::RegisterProfilePrefs() in chrome/browser/prefs/browser_prefs.cc 24 // See chrome::RegisterProfilePrefs() in chrome/browser/prefs/browser_prefs.cc
24 void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry) { 25 void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry) {
25 ExtensionPrefs::RegisterProfilePrefs(registry); 26 ExtensionPrefs::RegisterProfilePrefs(registry);
26 } 27 }
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // TODO(jamescook): Create a JavaScriptDialogManager or reuse the one from 121 // TODO(jamescook): Create a JavaScriptDialogManager or reuse the one from
121 // content_shell. 122 // content_shell.
122 NOTREACHED(); 123 NOTREACHED();
123 return NULL; 124 return NULL;
124 } 125 }
125 126
126 std::vector<BrowserContextKeyedServiceFactory*> 127 std::vector<BrowserContextKeyedServiceFactory*>
127 ShellExtensionsBrowserClient::GetExtensionSystemDependencies() { 128 ShellExtensionsBrowserClient::GetExtensionSystemDependencies() {
128 std::vector<BrowserContextKeyedServiceFactory*> depends_on; 129 std::vector<BrowserContextKeyedServiceFactory*> depends_on;
129 depends_on.push_back(ExtensionPrefsFactory::GetInstance()); 130 depends_on.push_back(ExtensionPrefsFactory::GetInstance());
131 depends_on.push_back(ExtensionRegistryFactory::GetInstance());
130 return depends_on; 132 return depends_on;
131 } 133 }
132 134
133 ExtensionSystem* ShellExtensionsBrowserClient::CreateExtensionSystem( 135 ExtensionSystem* ShellExtensionsBrowserClient::CreateExtensionSystem(
134 BrowserContext* context) { 136 BrowserContext* context) {
135 return new ShellExtensionSystem(context); 137 return new ShellExtensionSystem(context);
136 } 138 }
137 139
138 } // namespace extensions 140 } // namespace extensions
OLDNEW
« no previous file with comments | « apps/shell/shell_extension_system.cc ('k') | chrome/browser/automation/automation_provider_observers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698