| 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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 #endif | 246 #endif |
| 247 | 247 |
| 248 #if defined(OS_MACOSX) | 248 #if defined(OS_MACOSX) |
| 249 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 249 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
| 250 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 250 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 251 #endif | 251 #endif |
| 252 | 252 |
| 253 #if defined(OS_WIN) | 253 #if defined(OS_WIN) |
| 254 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 254 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
| 255 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" | 255 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" |
| 256 #include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h" |
| 256 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom
pt_prefs_manager.h" | 257 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom
pt_prefs_manager.h" |
| 257 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h" | 258 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h" |
| 258 #endif | 259 #endif |
| 259 | 260 |
| 260 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 261 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 261 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 262 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 262 #endif | 263 #endif |
| 263 | 264 |
| 264 #if defined(TOOLKIT_VIEWS) | 265 #if defined(TOOLKIT_VIEWS) |
| 265 #include "chrome/browser/ui/browser_view_prefs.h" | 266 #include "chrome/browser/ui/browser_view_prefs.h" |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 603 #if BUILDFLAG(ENABLE_RLZ) | 604 #if BUILDFLAG(ENABLE_RLZ) |
| 604 ChromeRLZTrackerDelegate::RegisterProfilePrefs(registry); | 605 ChromeRLZTrackerDelegate::RegisterProfilePrefs(registry); |
| 605 #endif | 606 #endif |
| 606 | 607 |
| 607 #if defined(OS_WIN) | 608 #if defined(OS_WIN) |
| 608 component_updater::RegisterProfilePrefsForSwReporter(registry); | 609 component_updater::RegisterProfilePrefsForSwReporter(registry); |
| 609 desktop_ios_promotion::RegisterProfilePrefs(registry); | 610 desktop_ios_promotion::RegisterProfilePrefs(registry); |
| 610 NetworkProfileBubble::RegisterProfilePrefs(registry); | 611 NetworkProfileBubble::RegisterProfilePrefs(registry); |
| 611 safe_browsing::SettingsResetPromptPrefsManager::RegisterProfilePrefs( | 612 safe_browsing::SettingsResetPromptPrefsManager::RegisterProfilePrefs( |
| 612 registry); | 613 registry); |
| 614 safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); |
| 613 #endif | 615 #endif |
| 614 | 616 |
| 615 #if defined(TOOLKIT_VIEWS) | 617 #if defined(TOOLKIT_VIEWS) |
| 616 RegisterBrowserViewProfilePrefs(registry); | 618 RegisterBrowserViewProfilePrefs(registry); |
| 617 RegisterInvertBubbleUserPrefs(registry); | 619 RegisterInvertBubbleUserPrefs(registry); |
| 618 #endif | 620 #endif |
| 619 | 621 |
| 620 #if defined(USE_ASH) | 622 #if defined(USE_ASH) |
| 621 RegisterChromeLauncherUserPrefs(registry); | 623 RegisterChromeLauncherUserPrefs(registry); |
| 622 #endif | 624 #endif |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 745 // default values for all prefs locally. Since we already have the defaults it | 747 // default values for all prefs locally. Since we already have the defaults it |
| 746 // would be wasteful to request them from the service by connecting to the | 748 // would be wasteful to request them from the service by connecting to the |
| 747 // DEFAULT_STORE. | 749 // DEFAULT_STORE. |
| 748 // TODO(sammc): Once we have this distinction, connect to the default pref | 750 // TODO(sammc): Once we have this distinction, connect to the default pref |
| 749 // store here (by erasing it from |pref_stores|). | 751 // store here (by erasing it from |pref_stores|). |
| 750 pref_stores.erase(PrefValueStore::USER_STORE); | 752 pref_stores.erase(PrefValueStore::USER_STORE); |
| 751 return pref_stores; | 753 return pref_stores; |
| 752 } | 754 } |
| 753 | 755 |
| 754 } // namespace chrome | 756 } // namespace chrome |
| OLD | NEW |