chrome/browser/prefs/browser_prefs.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/prefs/browser_prefs.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: Fix WeakPtr issue. Change PostTask on PostTaskAndReplyWithResult 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

« chrome/browser/chromeos/chrome_browser_main_chromeos.h ('K') | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/ui/app_list/app_list_syncable_service.h » ('j') | chrome/browser/ui/app_list/arc_app_icon.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 32950be71848f27bb52501f4c7c53be507eeec47..e6d2a476d1f58f23063603526a60c450695263da 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -224,6 +224,10 @@

#include "chrome/browser/ui/startup/default_browser_prompt.h"

#endif

+#if defined(ENABLE_ARC)

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

+#endif

namespace {

#if defined(OS_WIN)

@@ -493,6 +497,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

FlagsUI::RegisterProfilePrefs(registry);

#endif

+#if defined(ENABLE_ARC)

+ ArcAppListPrefs::RegisterProfilePrefs(registry);

+#endif

#if defined(OS_WIN)

component_updater::RegisterProfilePrefsForSwReporter(registry);

NetworkProfileBubble::RegisterProfilePrefs(registry);