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

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

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

Powered by Google App Engine
This is Rietveld 408576698