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

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

Issue 2906103002: Post-cleanup settings reset. (Closed)
Patch Set: Addressed alito's comments 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 #endif 247 #endif
248 248
249 #if defined(OS_MACOSX) 249 #if defined(OS_MACOSX)
250 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" 250 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
251 #include "chrome/browser/ui/cocoa/confirm_quit.h" 251 #include "chrome/browser/ui/cocoa/confirm_quit.h"
252 #endif 252 #endif
253 253
254 #if defined(OS_WIN) 254 #if defined(OS_WIN)
255 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" 255 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
256 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" 256 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
257 #include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
257 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom pt_prefs_manager.h" 258 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom pt_prefs_manager.h"
258 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h" 259 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h"
259 #endif 260 #endif
260 261
261 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 262 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
262 #include "chrome/browser/ui/startup/default_browser_prompt.h" 263 #include "chrome/browser/ui/startup/default_browser_prompt.h"
263 #endif 264 #endif
264 265
265 #if defined(TOOLKIT_VIEWS) 266 #if defined(TOOLKIT_VIEWS)
266 #include "chrome/browser/ui/browser_view_prefs.h" 267 #include "chrome/browser/ui/browser_view_prefs.h"
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 #if BUILDFLAG(ENABLE_RLZ) 636 #if BUILDFLAG(ENABLE_RLZ)
636 ChromeRLZTrackerDelegate::RegisterProfilePrefs(registry); 637 ChromeRLZTrackerDelegate::RegisterProfilePrefs(registry);
637 #endif 638 #endif
638 639
639 #if defined(OS_WIN) 640 #if defined(OS_WIN)
640 component_updater::RegisterProfilePrefsForSwReporter(registry); 641 component_updater::RegisterProfilePrefsForSwReporter(registry);
641 desktop_ios_promotion::RegisterProfilePrefs(registry); 642 desktop_ios_promotion::RegisterProfilePrefs(registry);
642 NetworkProfileBubble::RegisterProfilePrefs(registry); 643 NetworkProfileBubble::RegisterProfilePrefs(registry);
643 safe_browsing::SettingsResetPromptPrefsManager::RegisterProfilePrefs( 644 safe_browsing::SettingsResetPromptPrefsManager::RegisterProfilePrefs(
644 registry); 645 registry);
646 safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
645 #endif 647 #endif
646 648
647 #if defined(TOOLKIT_VIEWS) 649 #if defined(TOOLKIT_VIEWS)
648 RegisterBrowserViewProfilePrefs(registry); 650 RegisterBrowserViewProfilePrefs(registry);
649 RegisterInvertBubbleUserPrefs(registry); 651 RegisterInvertBubbleUserPrefs(registry);
650 #endif 652 #endif
651 653
652 #if defined(USE_ASH) 654 #if defined(USE_ASH)
653 RegisterChromeLauncherUserPrefs(registry); 655 RegisterChromeLauncherUserPrefs(registry);
654 #endif 656 #endif
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 // default values for all prefs locally. Since we already have the defaults it 817 // default values for all prefs locally. Since we already have the defaults it
816 // would be wasteful to request them from the service by connecting to the 818 // would be wasteful to request them from the service by connecting to the
817 // DEFAULT_STORE. 819 // DEFAULT_STORE.
818 // TODO(sammc): Once we have this distinction, connect to the default pref 820 // TODO(sammc): Once we have this distinction, connect to the default pref
819 // store here (by erasing it from |pref_stores|). 821 // store here (by erasing it from |pref_stores|).
820 pref_stores.erase(PrefValueStore::USER_STORE); 822 pref_stores.erase(PrefValueStore::USER_STORE);
821 return pref_stores; 823 return pref_stores;
822 } 824 }
823 825
824 } // namespace chrome 826 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698