diff options
| author | hashimoto <hashimoto@chromium.org> | 2014-08-25 04:08:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-25 11:09:18 +0000 |
| commit | 2d1cf16698ef2680ea50014b015fecf6db32e730 (patch) | |
| tree | 9633bde6c0540058db6c59fa184e85c92c77ef33 /chrome/browser/prefs | |
| parent | c921afdcc249a89bd9e8cc1cc898e4c320cc5d03 (diff) | |
| download | chromium_src-2d1cf16698ef2680ea50014b015fecf6db32e730.zip chromium_src-2d1cf16698ef2680ea50014b015fecf6db32e730.tar.gz chromium_src-2d1cf16698ef2680ea50014b015fecf6db32e730.tar.bz2 | |
Merge apps/pref* to extensions/browser/pref*
The pref's exclusive user AppWindow will move to extensions/browser
Merge apps/pref_names.{cc,h} to extensions/browser/pref_names.{cc,h}
Merge apps/prefs.{cc,h} to extensions/browser/extension_prefs.cc
BUG=403726
Committed: https://chromium.googlesource.com/chromium/src/+/3da4417c5baa6b8fe0be9aa012f0fd3294d9dbc7
Review URL: https://codereview.chromium.org/493003002
Cr-Commit-Position: refs/heads/master@{#291655}
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 44ff8a8..ee7cabd 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); |