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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2857103007: [Night Light] CL2: Ash and system tray work (Closed)
Patch Set: James' comments Created 3 years, 7 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
« ash/system/tiles/tray_tiles_unittest.cc ('K') | « ash/system/tray/system_tray_item.h ('k') | tools/metrics/actions/actions.xml » ('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 b56f942fa42c89cd7f967db5631335930e733a0d..6c1bd606aceca935c162ab641d0bf5d485aaa3f3 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -261,6 +261,7 @@
#endif
#if defined(USE_ASH)
+#include "ash/shell.h"
#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
#endif
@@ -644,6 +645,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
#if defined(USE_ASH)
ash::launcher::RegisterChromeLauncherUserPrefs(registry);
+ ash::Shell::RegisterPrefs(registry);
#endif
#if !defined(OS_ANDROID) && !defined(OS_IOS)
« ash/system/tiles/tray_tiles_unittest.cc ('K') | « ash/system/tray/system_tray_item.h ('k') | tools/metrics/actions/actions.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698