From dc63aab9a03d091b4c88a0967d19f52a61212e16 Mon Sep 17 00:00:00 2001 From: "benwells@chromium.org" Date: Tue, 12 Feb 2013 06:15:10 +0000 Subject: Move app_launcher.* out of chrome/browser/extensions and into apps/ This change also moves some UI code from chrome/browser/extensions into /chrome/browser/ui/, and cleans up the app_launcher.* code. BUG=159366 Review URL: https://chromiumcodereview.appspot.com/12095052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181875 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/prefs/browser_prefs.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/prefs/browser_prefs.cc') diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 2f708c7..9e1c2c1 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -4,6 +4,7 @@ #include "chrome/browser/prefs/browser_prefs.h" +#include "apps/prefs.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "chrome/browser/about_flags.h" @@ -21,7 +22,6 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" -#include "chrome/browser/extensions/app_launcher.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_web_ui.h" @@ -159,10 +159,10 @@ void RegisterLocalState(PrefService* local_state, registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); // Please keep this list alphabetized. + apps::RegisterPrefs(registry); browser_shutdown::RegisterPrefs(registry); BrowserProcessImpl::RegisterPrefs(registry); chrome::RegisterScreenshotPrefs(registry); - extensions::app_launcher::RegisterPrefs(registry); ExternalProtocolHandler::RegisterPrefs(registry); FlagsUI::RegisterPrefs(registry); geolocation::RegisterPrefs(registry); -- cgit v1.1