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

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: Reflect changes in FakeArcBridgeService 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 | « no previous file | chrome/browser/ui/app_list/app_list_model_builder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 90a759972c8f29d74734e13a65b7c2cf1cef8333..34e23719457eb533ee4945ed1ba9a9ff08d01d2f 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/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);
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/app_list_model_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698