Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6046)

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 12095052: Move app_launcher.* out of chrome/browser/extensions and into apps/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved switches back Created 7 years, 11 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
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 26472e47db57bd9eec167ca90875e893e7cebce5..3991026039f90fc10e5b6b69623ac5634fd07989 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/app_launcher.h"
#include "chrome/browser/about_flags.h"
#include "chrome/browser/accessibility/invert_bubble_prefs.h"
#include "chrome/browser/autofill/autofill_manager.h"
@@ -18,7 +19,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"
@@ -151,9 +151,9 @@ void RegisterLocalState(PrefServiceSimple* local_state) {
local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
// Please keep this list alphabetized.
+ apps::RegisterPrefs(local_state);
browser_shutdown::RegisterPrefs(local_state);
chrome::RegisterScreenshotPrefs(local_state);
- extensions::app_launcher::RegisterPrefs(local_state);
ExternalProtocolHandler::RegisterPrefs(local_state);
FlagsUI::RegisterPrefs(local_state);
geolocation::RegisterPrefs(local_state);

Powered by Google App Engine
This is Rietveld 408576698