diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 03:32:02 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 03:32:02 +0000 |
| commit | cb6341ecbc07e4758890eba3aedf07b96045ec3d (patch) | |
| tree | 82c50b2c052acd1ee548ed5f7758eaa266a3b721 /chrome/browser/prefs/browser_prefs.cc | |
| parent | 90fbd61bcaf1929d7a56ce754667beba6d18b8c7 (diff) | |
| download | chromium_src-cb6341ecbc07e4758890eba3aedf07b96045ec3d.zip chromium_src-cb6341ecbc07e4758890eba3aedf07b96045ec3d.tar.gz chromium_src-cb6341ecbc07e4758890eba3aedf07b96045ec3d.tar.bz2 | |
Android: Remove app_window extension API.
BUG=305852
Review URL: https://codereview.chromium.org/328043003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index a2e5a62..6c10c4d 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -4,7 +4,6 @@ #include "chrome/browser/prefs/browser_prefs.h" -#include "apps/prefs.h" #include "base/debug/trace_event.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" @@ -105,6 +104,7 @@ #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" @@ -340,7 +340,6 @@ void RegisterLocalState(PrefRegistrySimple* registry) { void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); // User prefs. Please keep this list alphabetized. - apps::RegisterProfilePrefs(registry); autofill::AutofillManager::RegisterProfilePrefs(registry); bookmark_utils::RegisterProfilePrefs(registry); sync_driver::SyncPrefs::RegisterProfilePrefs(registry); @@ -384,6 +383,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { #endif #if defined(ENABLE_EXTENSIONS) + apps::RegisterProfilePrefs(registry); extensions::ActivityLog::RegisterProfilePrefs(registry); extensions::launch_util::RegisterProfilePrefs(registry); #endif |