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

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: Created 5 years, 2 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/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index fbd17bb2d13ff4a4e575318d41491795517618dd..ef0b110c57aa638f8d6e1ed8dda9686c1b4e4b33 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -55,6 +55,7 @@
#include "chrome/browser/tracing/chrome_tracing_delegate.h"
#include "chrome/browser/ui/app_list/app_list_prefs.h"
#include "chrome/browser/ui/app_list/app_list_service.h"
+#include "chrome/browser/ui/app_list/arc_app_prefs.h"
#include "chrome/browser/ui/browser_ui_prefs.h"
#include "chrome/browser/ui/navigation_correction_tab_observer.h"
#include "chrome/browser/ui/network_profile_bubble.h"
@@ -519,6 +520,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
#if !defined(OS_ANDROID) && !defined(OS_IOS)
browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
#endif
+ ArcAppPrefs::RegisterProfilePrefs(registry);
elijahtaylor1 2015/10/28 06:32:38 this should probably be in the OS_CHROMEOS section
khmel1 2015/10/29 08:12:18 Done.
}
void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

Powered by Google App Engine
This is Rietveld 408576698