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

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

Issue 2857103007: [Night Light] CL2: Ash and system tray work (Closed)
Patch Set: Exclude one test from mash 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
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..6e234e8bfeb40883d9bcf354d7d13b2d77afc514 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/system/night_light/night_light_controller.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::NightLightController::RegisterPrefs(registry);
James Cook 2017/05/05 17:12:33 Can this be done inside of ash somewhere, like may
afakhry 2017/05/05 20:04:12 I don't think we can do it in Shell init, but I mi
#endif
#if !defined(OS_ANDROID) && !defined(OS_IOS)

Powered by Google App Engine
This is Rietveld 408576698