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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 25034003: Moved apps metro code from apps to chrome/browser/apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix stuffup Created 7 years, 3 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
« no previous file with comments | « chrome/browser/apps/chrome_apps_client.cc ('k') | chrome/browser/ui/apps/app_metro_infobar_delegate_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index e9d0488c66a57cde480ca59d0c3f300b261b800b..886a0f544d2d394fe36aa1f624dbec2c1b984a43 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -179,6 +179,10 @@
#include "chrome/browser/plugins/plugins_resource_service.h"
#endif
+#if defined(OS_WIN)
+#include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
+#endif
+
namespace {
enum MigratedPreferences {
@@ -214,7 +218,9 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
// Please keep this list alphabetized.
AppListService::RegisterPrefs(registry);
- apps::RegisterPrefs(registry);
+#if defined(OS_WIN)
sky 2013/10/01 17:38:54 move with rest of platform specific inits below.
benwells 2013/10/02 00:57:59 Done.
+ app_metro_launch::RegisterPrefs(registry);
+#endif
browser_shutdown::RegisterPrefs(registry);
BrowserProcessImpl::RegisterPrefs(registry);
RegisterScreenshotPrefs(registry);
« no previous file with comments | « chrome/browser/apps/chrome_apps_client.cc ('k') | chrome/browser/ui/apps/app_metro_infobar_delegate_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698