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

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

Issue 785723002: Add new extension APIs related to animation policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: AccessibilityNotifier Created 5 years, 11 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/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/prefs/pref_registry_simple.h" 11 #include "base/prefs/pref_registry_simple.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/prefs/scoped_user_pref_update.h" 13 #include "base/prefs/scoped_user_pref_update.h"
14 #include "chrome/browser/about_flags.h" 14 #include "chrome/browser/about_flags.h"
15 #include "chrome/browser/accessibility/animation_policy_prefs.h"
15 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 16 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
16 #include "chrome/browser/autocomplete/zero_suggest_provider.h" 17 #include "chrome/browser/autocomplete/zero_suggest_provider.h"
17 #include "chrome/browser/browser_process_impl.h" 18 #include "chrome/browser/browser_process_impl.h"
18 #include "chrome/browser/browser_shutdown.h" 19 #include "chrome/browser/browser_shutdown.h"
19 #include "chrome/browser/chrome_content_browser_client.h" 20 #include "chrome/browser/chrome_content_browser_client.h"
20 #include "chrome/browser/component_updater/recovery_component_installer.h" 21 #include "chrome/browser/component_updater/recovery_component_installer.h"
21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 22 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
22 #include "chrome/browser/devtools/devtools_window.h" 23 #include "chrome/browser/devtools/devtools_window.h"
23 #include "chrome/browser/download/download_prefs.h" 24 #include "chrome/browser/download/download_prefs.h"
24 #include "chrome/browser/external_protocol/external_protocol_handler.h" 25 #include "chrome/browser/external_protocol/external_protocol_handler.h"
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 NetPrefObserver::RegisterProfilePrefs(registry); 405 NetPrefObserver::RegisterProfilePrefs(registry);
405 password_manager::PasswordManager::RegisterProfilePrefs(registry); 406 password_manager::PasswordManager::RegisterProfilePrefs(registry);
406 password_manager::urls_collection_experiment::RegisterPrefs(registry); 407 password_manager::urls_collection_experiment::RegisterPrefs(registry);
407 password_bubble_experiment::RegisterPrefs(registry); 408 password_bubble_experiment::RegisterPrefs(registry);
408 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); 409 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
409 PrefsTabHelper::RegisterProfilePrefs(registry); 410 PrefsTabHelper::RegisterProfilePrefs(registry);
410 Profile::RegisterProfilePrefs(registry); 411 Profile::RegisterProfilePrefs(registry);
411 ProfileImpl::RegisterProfilePrefs(registry); 412 ProfileImpl::RegisterProfilePrefs(registry);
412 PromoResourceService::RegisterProfilePrefs(registry); 413 PromoResourceService::RegisterProfilePrefs(registry);
413 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); 414 ProtocolHandlerRegistry::RegisterProfilePrefs(registry);
414 RegisterBrowserUserPrefs(registry); 415 RegisterBrowserUserPrefs(registry);
dmazzoni 2015/01/27 06:52:41 I'd put RegisterAnimationPolicyPrefs(registry) her
je_julie(Not used) 2015/01/28 04:42:00 You're right. I have to keep ordering. Done.
415 SessionStartupPref::RegisterProfilePrefs(registry); 416 SessionStartupPref::RegisterProfilePrefs(registry);
416 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); 417 TemplateURLPrepopulateData::RegisterProfilePrefs(registry);
417 translate::TranslatePrefs::RegisterProfilePrefs(registry); 418 translate::TranslatePrefs::RegisterProfilePrefs(registry);
418 ZeroSuggestProvider::RegisterProfilePrefs(registry); 419 ZeroSuggestProvider::RegisterProfilePrefs(registry);
419 420
420 #if defined(ENABLE_APP_LIST) 421 #if defined(ENABLE_APP_LIST)
421 app_list::AppListPrefs::RegisterProfilePrefs(registry); 422 app_list::AppListPrefs::RegisterProfilePrefs(registry);
422 #endif 423 #endif
423 424
424 #if defined(ENABLE_AUTOFILL_DIALOG) 425 #if defined(ENABLE_AUTOFILL_DIALOG)
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 518
518 #if defined(TOOLKIT_VIEWS) 519 #if defined(TOOLKIT_VIEWS)
519 RegisterBrowserViewProfilePrefs(registry); 520 RegisterBrowserViewProfilePrefs(registry);
520 RegisterInvertBubbleUserPrefs(registry); 521 RegisterInvertBubbleUserPrefs(registry);
521 #endif 522 #endif
522 523
523 #if defined(USE_ASH) 524 #if defined(USE_ASH)
524 ash::RegisterChromeLauncherUserPrefs(registry); 525 ash::RegisterChromeLauncherUserPrefs(registry);
525 #endif 526 #endif
526 527
528 RegisterAnimationPolicyPrefs(registry);
dmazzoni 2015/01/27 06:52:41 This should move up
527 // Preferences registered only for migration (clearing or moving to a new key) 529 // Preferences registered only for migration (clearing or moving to a new key)
528 // go here. 530 // go here.
529 registry->RegisterDictionaryPref( 531 registry->RegisterDictionaryPref(
530 kBackupPref, 532 kBackupPref,
531 new base::DictionaryValue(), 533 new base::DictionaryValue(),
532 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 534 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
533 #if !defined(OS_ANDROID) 535 #if !defined(OS_ANDROID)
534 registry->RegisterStringPref( 536 registry->RegisterStringPref(
535 kSyncPromoErrorMessage, 537 kSyncPromoErrorMessage,
536 std::string(), 538 std::string(),
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); 682 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */);
681 683
682 // We're done migrating the profile per-host zoom level values, so we clear 684 // We're done migrating the profile per-host zoom level values, so we clear
683 // them all. 685 // them all.
684 DictionaryPrefUpdate host_zoom_dictionary_update( 686 DictionaryPrefUpdate host_zoom_dictionary_update(
685 prefs, prefs::kPerHostZoomLevelsDeprecated); 687 prefs, prefs::kPerHostZoomLevelsDeprecated);
686 host_zoom_dictionary_update->Clear(); 688 host_zoom_dictionary_update->Clear();
687 } 689 }
688 690
689 } // namespace chrome 691 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698