| OLD | NEW |
| 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/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 #include "chrome/browser/extensions/activity_log/activity_log.h" | 109 #include "chrome/browser/extensions/activity_log/activity_log.h" |
| 110 #include "chrome/browser/extensions/api/commands/command_service.h" | 110 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 111 #include "chrome/browser/extensions/api/copresence/copresence_api.h" | 111 #include "chrome/browser/extensions/api/copresence/copresence_api.h" |
| 112 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 112 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
| 113 #include "chrome/browser/extensions/component_migration_helper.h" | 113 #include "chrome/browser/extensions/component_migration_helper.h" |
| 114 #include "chrome/browser/extensions/extension_web_ui.h" | 114 #include "chrome/browser/extensions/extension_web_ui.h" |
| 115 #include "chrome/browser/extensions/launch_util.h" | 115 #include "chrome/browser/extensions/launch_util.h" |
| 116 #include "chrome/browser/signin/easy_unlock_service.h" | 116 #include "chrome/browser/signin/easy_unlock_service.h" |
| 117 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 117 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
| 118 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 118 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 119 #include "extensions/browser/api/runtime/runtime_api.h" | |
| 120 #include "extensions/browser/extension_prefs.h" | 119 #include "extensions/browser/extension_prefs.h" |
| 121 #endif // defined(ENABLE_EXTENSIONS) | 120 #endif // defined(ENABLE_EXTENSIONS) |
| 122 | 121 |
| 123 #if defined(ENABLE_PLUGIN_INSTALLATION) | 122 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 124 #include "chrome/browser/plugins/plugins_resource_service.h" | 123 #include "chrome/browser/plugins/plugins_resource_service.h" |
| 125 #endif | 124 #endif |
| 126 | 125 |
| 127 #if defined(ENABLE_SUPERVISED_USERS) | 126 #if defined(ENABLE_SUPERVISED_USERS) |
| 128 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" | 127 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" |
| 129 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" | 128 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 #if defined(ENABLE_EXTENSIONS) | 463 #if defined(ENABLE_EXTENSIONS) |
| 465 EasyUnlockService::RegisterProfilePrefs(registry); | 464 EasyUnlockService::RegisterProfilePrefs(registry); |
| 466 ExtensionWebUI::RegisterProfilePrefs(registry); | 465 ExtensionWebUI::RegisterProfilePrefs(registry); |
| 467 RegisterAnimationPolicyPrefs(registry); | 466 RegisterAnimationPolicyPrefs(registry); |
| 468 ToolbarActionsBar::RegisterProfilePrefs(registry); | 467 ToolbarActionsBar::RegisterProfilePrefs(registry); |
| 469 extensions::ActivityLog::RegisterProfilePrefs(registry); | 468 extensions::ActivityLog::RegisterProfilePrefs(registry); |
| 470 extensions::ComponentMigrationHelper::RegisterPrefs(registry); | 469 extensions::ComponentMigrationHelper::RegisterPrefs(registry); |
| 471 extensions::CopresenceService::RegisterProfilePrefs(registry); | 470 extensions::CopresenceService::RegisterProfilePrefs(registry); |
| 472 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); | 471 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); |
| 473 extensions::launch_util::RegisterProfilePrefs(registry); | 472 extensions::launch_util::RegisterProfilePrefs(registry); |
| 474 extensions::RuntimeAPI::RegisterPrefs(registry); | |
| 475 #endif // defined(ENABLE_EXTENSIONS) | 473 #endif // defined(ENABLE_EXTENSIONS) |
| 476 | 474 |
| 477 #if defined(ENABLE_NOTIFICATIONS) | 475 #if defined(ENABLE_NOTIFICATIONS) |
| 478 NotifierStateTracker::RegisterProfilePrefs(registry); | 476 NotifierStateTracker::RegisterProfilePrefs(registry); |
| 479 #endif | 477 #endif |
| 480 | 478 |
| 481 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \ | 479 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \ |
| 482 !defined(OS_ANDROID) | 480 !defined(OS_ANDROID) |
| 483 // The extension welcome notification requires a build that enables extensions | 481 // The extension welcome notification requires a build that enables extensions |
| 484 // and notifications, and uses the UI message center. | 482 // and notifications, and uses the UI message center. |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 703 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, | 701 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, |
| 704 install_time.ToInternalValue()); | 702 install_time.ToInternalValue()); |
| 705 } | 703 } |
| 706 profile_prefs->ClearPref(kCheckDefaultBrowser); | 704 profile_prefs->ClearPref(kCheckDefaultBrowser); |
| 707 | 705 |
| 708 // Added 5/2016. | 706 // Added 5/2016. |
| 709 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); | 707 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); |
| 710 } | 708 } |
| 711 | 709 |
| 712 } // namespace chrome | 710 } // namespace chrome |
| OLD | NEW |