| Index: apps/shell/browser/shell_extension_system.cc
|
| diff --git a/apps/shell/browser/shell_extension_system.cc b/apps/shell/browser/shell_extension_system.cc
|
| index 324368fa76c7681a133da40b0223391447accf41..549931abc800b0f0f8919bd0f362cd1a8b532917 100644
|
| --- a/apps/shell/browser/shell_extension_system.cc
|
| +++ b/apps/shell/browser/shell_extension_system.cc
|
| @@ -17,9 +17,7 @@
|
| #include "content/public/browser/notification_source.h"
|
| #include "extensions/browser/event_router.h"
|
| #include "extensions/browser/extension_prefs.h"
|
| -#include "extensions/browser/extension_prefs_factory.h"
|
| #include "extensions/browser/extension_registry.h"
|
| -#include "extensions/browser/extension_registry_factory.h"
|
| #include "extensions/browser/info_map.h"
|
| #include "extensions/browser/lazy_background_task_queue.h"
|
| #include "extensions/browser/process_manager.h"
|
| @@ -38,15 +36,6 @@ ShellExtensionSystem::ShellExtensionSystem(BrowserContext* browser_context)
|
| ShellExtensionSystem::~ShellExtensionSystem() {
|
| }
|
|
|
| -// static
|
| -std::vector<BrowserContextKeyedServiceFactory*>
|
| -ShellExtensionSystem::GetDependencies() {
|
| - std::vector<BrowserContextKeyedServiceFactory*> depends_on;
|
| - depends_on.push_back(ExtensionPrefsFactory::GetInstance());
|
| - depends_on.push_back(ExtensionRegistryFactory::GetInstance());
|
| - return depends_on;
|
| -}
|
| -
|
| bool ShellExtensionSystem::LoadAndLaunchApp(const base::FilePath& app_dir) {
|
| std::string load_error;
|
| scoped_refptr<Extension> extension =
|
|
|