Chromium Code Reviews| Index: chrome/browser/ui/app_list/app_list_syncable_service_factory.cc |
| diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc b/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc |
| index 09a6a80c0364ed7d0ced63d019033828b11e67d0..cfe3e58f9c22aaa7f6a5ea47af805497040df7ee 100644 |
| --- a/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc |
| +++ b/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc |
| @@ -4,7 +4,10 @@ |
| #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" |
| +#include <set> |
| + |
| #include "base/prefs/pref_service.h" |
| +#include "chrome/browser/apps/drive/drive_app_provider.h" |
| #include "chrome/browser/profiles/incognito_helpers.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
| @@ -50,8 +53,15 @@ AppListSyncableServiceFactory::AppListSyncableServiceFactory() |
| "AppListSyncableService", |
| BrowserContextDependencyManager::GetInstance()) { |
| VLOG(1) << "AppListSyncableServiceFactory()"; |
| - DependsOn( |
| + typedef std::set<BrowserContextKeyedServiceFactory*> FactorySet; |
| + FactorySet factories; |
|
stevenjb
2014/06/05 20:15:16
nit: 'dependent_factories'
xiyuan
2014/06/05 20:36:14
Done in the next patch.
|
| + factories.insert( |
| extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); |
| + DriveAppProvider::AppendDependsOnFactories(&factories); |
| + for (FactorySet::iterator it = factories.begin(); it != factories.end(); |
| + ++it) { |
| + DependsOn(*it); |
| + } |
| } |
| AppListSyncableServiceFactory::~AppListSyncableServiceFactory() { |