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

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

Issue 2906103002: Post-cleanup settings reset. (Closed)
Patch Set: Rebase 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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 #endif 242 #endif
243 243
244 #if defined(OS_MACOSX) 244 #if defined(OS_MACOSX)
245 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" 245 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
246 #include "chrome/browser/ui/cocoa/confirm_quit.h" 246 #include "chrome/browser/ui/cocoa/confirm_quit.h"
247 #endif 247 #endif
248 248
249 #if defined(OS_WIN) 249 #if defined(OS_WIN)
250 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" 250 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
251 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" 251 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
252 #include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
252 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom pt_prefs_manager.h" 253 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom pt_prefs_manager.h"
253 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h" 254 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h"
254 #endif 255 #endif
255 256
256 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 257 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
257 #include "chrome/browser/ui/startup/default_browser_prompt.h" 258 #include "chrome/browser/ui/startup/default_browser_prompt.h"
258 #endif 259 #endif
259 260
260 #if defined(TOOLKIT_VIEWS) 261 #if defined(TOOLKIT_VIEWS)
261 #include "chrome/browser/ui/browser_view_prefs.h" 262 #include "chrome/browser/ui/browser_view_prefs.h"
(...skipping 368 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::RegisterChromeCleanerProfilePrefs(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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 // default values for all prefs locally. Since we already have the defaults it 808 // default values for all prefs locally. Since we already have the defaults it
807 // would be wasteful to request them from the service by connecting to the 809 // would be wasteful to request them from the service by connecting to the
808 // DEFAULT_STORE. 810 // DEFAULT_STORE.
809 // TODO(sammc): Once we have this distinction, connect to the default pref 811 // TODO(sammc): Once we have this distinction, connect to the default pref
810 // store here (by erasing it from |pref_stores|). 812 // store here (by erasing it from |pref_stores|).
811 pref_stores.erase(PrefValueStore::USER_STORE); 813 pref_stores.erase(PrefValueStore::USER_STORE);
812 return pref_stores; 814 return pref_stores;
813 } 815 }
814 816
815 } // namespace chrome 817 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698