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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2772313004: [ash-md] WIP Added wallpaper color caching. (Closed)
Patch Set: "Working'ish" prototype Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" 223 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h"
224 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 224 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
225 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 225 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
226 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 226 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
227 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 227 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
228 #include "chromeos/network/proxy/proxy_config_handler.h" 228 #include "chromeos/network/proxy/proxy_config_handler.h"
229 #include "chromeos/timezone/timezone_resolver.h" 229 #include "chromeos/timezone/timezone_resolver.h"
230 #include "components/invalidation/impl/invalidator_storage.h" 230 #include "components/invalidation/impl/invalidator_storage.h"
231 #include "components/onc/onc_pref_names.h" 231 #include "components/onc/onc_pref_names.h"
232 #include "components/quirks/quirks_manager.h" 232 #include "components/quirks/quirks_manager.h"
233 #include "components/wallpaper/pref_based_wallpaper_color_cache.h"
233 #else 234 #else
234 #include "chrome/browser/extensions/default_apps.h" 235 #include "chrome/browser/extensions/default_apps.h"
235 #endif 236 #endif
236 237
237 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) 238 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
238 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 239 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
239 #endif 240 #endif
240 241
241 #if defined(OS_MACOSX) 242 #if defined(OS_MACOSX)
242 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" 243 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 invalidation::InvalidatorStorage::RegisterPrefs(registry); 429 invalidation::InvalidatorStorage::RegisterPrefs(registry);
429 ::onc::RegisterPrefs(registry); 430 ::onc::RegisterPrefs(registry);
430 policy::AutoEnrollmentClient::RegisterPrefs(registry); 431 policy::AutoEnrollmentClient::RegisterPrefs(registry);
431 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); 432 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);
432 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); 433 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);
433 policy::DeviceStatusCollector::RegisterPrefs(registry); 434 policy::DeviceStatusCollector::RegisterPrefs(registry);
434 policy::DMTokenStorage::RegisterPrefs(registry); 435 policy::DMTokenStorage::RegisterPrefs(registry);
435 policy::PolicyCertServiceFactory::RegisterPrefs(registry); 436 policy::PolicyCertServiceFactory::RegisterPrefs(registry);
436 quirks::QuirksManager::RegisterPrefs(registry); 437 quirks::QuirksManager::RegisterPrefs(registry);
437 438
439 // TODO(bruthig): Is this the right place to register prefs?
440 wallpaper::PrefBasedWallpaperColorCache::RegisterPrefs(registry);
jonross 2017/03/28 14:33:27 I would merge this with WallpaperManagerBase::Regi
441
438 // Moved to profile prefs, but we still need to register the prefs in local 442 // Moved to profile prefs, but we still need to register the prefs in local
439 // state until migration is complete (See MigrateObsoleteBrowserPrefs()). 443 // state until migration is complete (See MigrateObsoleteBrowserPrefs()).
440 chromeos::system::InputDeviceSettings::RegisterProfilePrefs(registry); 444 chromeos::system::InputDeviceSettings::RegisterProfilePrefs(registry);
441 #endif 445 #endif
442 446
443 #if defined(OS_MACOSX) 447 #if defined(OS_MACOSX)
444 confirm_quit::RegisterLocalState(registry); 448 confirm_quit::RegisterLocalState(registry);
445 QuitWithAppsController::RegisterPrefs(registry); 449 QuitWithAppsController::RegisterPrefs(registry);
446 #endif 450 #endif
447 451
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 if (distro_dict && 789 if (distro_dict &&
786 distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) { 790 distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) {
787 profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay); 791 profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay);
788 } 792 }
789 #endif // BUILDFLAG(ENABLE_RLZ) 793 #endif // BUILDFLAG(ENABLE_RLZ)
790 profile_prefs->ClearPref(kDistroDict); 794 profile_prefs->ClearPref(kDistroDict);
791 } 795 }
792 } 796 }
793 797
794 } // namespace chrome 798 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698