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

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

Issue 2906103002: Post-cleanup settings reset. (Closed)
Patch Set: Created 3 years, 6 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "chrome/browser/prefs/session_startup_pref.h" 45 #include "chrome/browser/prefs/session_startup_pref.h"
46 #include "chrome/browser/profiles/chrome_version_service.h" 46 #include "chrome/browser/profiles/chrome_version_service.h"
47 #include "chrome/browser/profiles/net_http_session_params_observer.h" 47 #include "chrome/browser/profiles/net_http_session_params_observer.h"
48 #include "chrome/browser/profiles/profile.h" 48 #include "chrome/browser/profiles/profile.h"
49 #include "chrome/browser/profiles/profile_impl.h" 49 #include "chrome/browser/profiles/profile_impl.h"
50 #include "chrome/browser/profiles/profile_info_cache.h" 50 #include "chrome/browser/profiles/profile_info_cache.h"
51 #include "chrome/browser/profiles/profiles_state.h" 51 #include "chrome/browser/profiles/profiles_state.h"
52 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h" 52 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
53 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" 53 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
54 #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h" 54 #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h"
55 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_prefs_manag er_win.h"
55 #include "chrome/browser/search/search.h" 56 #include "chrome/browser/search/search.h"
56 #include "chrome/browser/signin/signin_manager_factory.h" 57 #include "chrome/browser/signin/signin_manager_factory.h"
57 #include "chrome/browser/task_manager/task_manager_interface.h" 58 #include "chrome/browser/task_manager/task_manager_interface.h"
58 #include "chrome/browser/tracing/chrome_tracing_delegate.h" 59 #include "chrome/browser/tracing/chrome_tracing_delegate.h"
59 #include "chrome/browser/ui/app_list/app_list_service.h" 60 #include "chrome/browser/ui/app_list/app_list_service.h"
60 #include "chrome/browser/ui/browser_ui_prefs.h" 61 #include "chrome/browser/ui/browser_ui_prefs.h"
61 #include "chrome/browser/ui/navigation_correction_tab_observer.h" 62 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
62 #include "chrome/browser/ui/network_profile_bubble.h" 63 #include "chrome/browser/ui/network_profile_bubble.h"
63 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 64 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
64 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 65 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 #if BUILDFLAG(ENABLE_RLZ) 631 #if BUILDFLAG(ENABLE_RLZ)
631 ChromeRLZTrackerDelegate::RegisterProfilePrefs(registry); 632 ChromeRLZTrackerDelegate::RegisterProfilePrefs(registry);
632 #endif 633 #endif
633 634
634 #if defined(OS_WIN) 635 #if defined(OS_WIN)
635 component_updater::RegisterProfilePrefsForSwReporter(registry); 636 component_updater::RegisterProfilePrefsForSwReporter(registry);
636 desktop_ios_promotion::RegisterProfilePrefs(registry); 637 desktop_ios_promotion::RegisterProfilePrefs(registry);
637 NetworkProfileBubble::RegisterProfilePrefs(registry); 638 NetworkProfileBubble::RegisterProfilePrefs(registry);
638 safe_browsing::SettingsResetPromptPrefsManager::RegisterProfilePrefs( 639 safe_browsing::SettingsResetPromptPrefsManager::RegisterProfilePrefs(
639 registry); 640 registry);
641 safe_browsing::ChromeCleanerPrefsManager::RegisterProfilePrefs(registry);
640 #endif 642 #endif
641 643
642 #if defined(TOOLKIT_VIEWS) 644 #if defined(TOOLKIT_VIEWS)
643 RegisterBrowserViewProfilePrefs(registry); 645 RegisterBrowserViewProfilePrefs(registry);
644 RegisterInvertBubbleUserPrefs(registry); 646 RegisterInvertBubbleUserPrefs(registry);
645 #endif 647 #endif
646 648
647 #if defined(USE_ASH) 649 #if defined(USE_ASH)
648 RegisterChromeLauncherUserPrefs(registry); 650 RegisterChromeLauncherUserPrefs(registry);
649 #endif 651 #endif
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 // default values for all prefs locally. Since we already have the defaults it 822 // default values for all prefs locally. Since we already have the defaults it
821 // would be wasteful to request them from the service by connecting to the 823 // would be wasteful to request them from the service by connecting to the
822 // DEFAULT_STORE. 824 // DEFAULT_STORE.
823 // TODO(sammc): Once we have this distinction, connect to the default pref 825 // TODO(sammc): Once we have this distinction, connect to the default pref
824 // store here (by erasing it from |pref_stores|). 826 // store here (by erasing it from |pref_stores|).
825 pref_stores.erase(PrefValueStore::USER_STORE); 827 pref_stores.erase(PrefValueStore::USER_STORE);
826 return pref_stores; 828 return pref_stores;
827 } 829 }
828 830
829 } // namespace chrome 831 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698