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: revert wrongly update chrome/chrome_browser_ui.gypi 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

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..b052faeecfc6aac07c2f7ff7f48e5d037f0a787d 100644

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

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

@@ -186,6 +186,7 @@

#include "chrome/browser/extensions/extension_assets_manager_chromeos.h"

#include "chrome/browser/media/protected_media_identifier_permission_context.h"

#include "chrome/browser/metrics/chromeos_metrics_provider.h"

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

#include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"

#include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h"

#include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"

@@ -491,6 +492,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::

RegisterProfilePrefs(registry);

FlagsUI::RegisterProfilePrefs(registry);

+ ArcAppListPrefs::RegisterProfilePrefs(registry);

#endif

#if defined(OS_WIN)

« no previous file with comments | « no previous file | chrome/browser/ui/app_list/app_list_syncable_service.h » ('j') | chrome/browser/ui/app_list/arc_app_list_prefs.cc » ('J')