chrome/browser/prefs/browser_prefs.cc - Issue 2055553004: arc: Support pinned apps across Arc-enabled and Arc-disabled platforms.

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 2055553004: arc: Support pinned apps across Arc-enabled and Arc-disabled platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: chrome_mash_shelf_controller.cc update due namespace renaming Created 4 years, 6 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

« no previous file with comments | « chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc ('k') | chrome/browser/ui/app_list/app_list_syncable_service.h » ('j') | no next file with comments »
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 14253050940c4c99213f99d0deb3a14b9b80962f..362de41bb5a98238d8976e0b052d7ef896c39238 100644

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

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

@@ -572,7 +572,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

#endif

#if defined(USE_ASH)

- ash::RegisterChromeLauncherUserPrefs(registry);

+ ash::launcher::RegisterChromeLauncherUserPrefs(registry);

#endif

#if !defined(OS_ANDROID)