[Night Light] CL2: Ash and system tray work

chrome/browser/prefs/browser_prefs.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 243 matching lines @@
 
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/startup/default_browser_prompt.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/browser_view_prefs.h"
 #endif
 
 #if defined(USE_ASH)
+#include "ash/shell.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "chrome/browser/ui/webui/md_history_ui.h"
 #include "chrome/browser/ui/webui/settings/md_settings_ui.h"
 #endif
 
 namespace {
 
@@ skipping 363 matching lines @@
       registry);
 #endif
 
 #if defined(TOOLKIT_VIEWS)
   RegisterBrowserViewProfilePrefs(registry);
   RegisterInvertBubbleUserPrefs(registry);
 #endif
 
 #if defined(USE_ASH)
   RegisterChromeLauncherUserPrefs(registry);
+  ash::Shell::RegisterPrefs(registry);
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   MdHistoryUI::RegisterProfilePrefs(registry);
   settings::MdSettingsUI::RegisterProfilePrefs(registry);
 #endif
 
   // Preferences registered only for migration (clearing or moving to a new key)
   // go here.
 
@@ skipping 161 matching lines @@
   // default values for all prefs locally. Since we already have the defaults it
   // would be wasteful to request them from the service by connecting to the
   // DEFAULT_STORE.
   // TODO(sammc): Once we have this distinction, connect to the default pref
   // store here (by erasing it from |pref_stores|).
   pref_stores.erase(PrefValueStore::USER_STORE);
   return pref_stores;
 }
 
 }  // namespace chrome