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

Unified Diff: chrome/browser/ui/app_list/app_list_syncable_service_factory.cc

Issue 308003005: app_list: Drive app integration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: crx_installer changes Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
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() {

Powered by Google App Engine
This is Rietveld 408576698