chrome/browser/prefs/browser_prefs.cc - Issue 493003002: Merge apps/pref* to extensions/browser/pref*

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 493003002: Merge apps/pref* to extensions/browser/pref* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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:

Index: chrome/browser/prefs/browser_prefs.cc

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

index 44ff8a8423e123811857325efa7d944325040642..ee7cabdb0d63ab844f48750040b2c44610eb5d9e 100644

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

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

@@ -107,7 +107,6 @@

#endif

#if defined(ENABLE_EXTENSIONS)

-#include "apps/prefs.h"

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

#include "chrome/browser/extensions/api/commands/command_service.h"

#include "chrome/browser/extensions/api/tabs/tabs_api.h"

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

#endif

#if defined(ENABLE_EXTENSIONS)

- apps::RegisterProfilePrefs(registry);

EasyUnlockService::RegisterProfilePrefs(registry);

extensions::ActivityLog::RegisterProfilePrefs(registry);

extensions::launch_util::RegisterProfilePrefs(registry);