chrome/browser/ui/app_list/app_list_syncable_service_factory.cc - Issue 1413153007: arc-app-launcher: Minimal support for ARC app launcher.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1413153007: arc-app-launcher: Minimal support for ARC app launcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Discard accidental change in chrome/browser/prefs/browser_prefs.cc Created 5 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/app_list/app_list_syncable_service.cc ('k') | chrome/browser/ui/app_list/arc_app_icon.h » ('j') | chrome/browser/ui/app_list/arc_app_icon.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 2c96dc229a0755c8c9bb22eab841287b1b8e069a..f9553709f35d52429ecda4f9bd15b058a2b28020 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

@@ -11,6 +11,7 @@

#include "chrome/browser/profiles/incognito_helpers.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/app_list/app_list_syncable_service.h"

+#include "chrome/browser/ui/app_list/arc_app_prefs_factory.h"

xiyuan 2015/11/12 17:32:44 Move this down into the #if defined(OS_CHROMEOS) b

khmel1 2015/11/13 15:00:55 Thanks, I missed this.

#include "components/keyed_service/content/browser_context_dependency_manager.h"

#include "extensions/browser/extension_system.h"

#include "extensions/browser/extension_system_provider.h"

@@ -57,6 +58,7 @@ AppListSyncableServiceFactory::AppListSyncableServiceFactory()

FactorySet dependent_factories;

dependent_factories.insert(

extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());

+ dependent_factories.insert(ArcAppPrefsFactory::GetInstance());

xiyuan 2015/11/12 17:32:44 #if defined(OS_CHROMEOS)

khmel1 2015/11/13 15:00:55 Done.

DriveAppProvider::AppendDependsOnFactories(&dependent_factories);

for (FactorySet::iterator it = dependent_factories.begin();

it != dependent_factories.end();