| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
| 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 9 #include "chrome/browser/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 69 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
| 70 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 70 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
| 71 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" | 71 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" |
| 72 #include "chrome/browser/upgrade_detector.h" | 72 #include "chrome/browser/upgrade_detector.h" |
| 73 #include "chrome/browser/web_resource/promo_resource_service.h" | 73 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 74 #include "chrome/common/pref_names.h" | 74 #include "chrome/common/pref_names.h" |
| 75 #include "content/public/browser/render_process_host.h" | 75 #include "content/public/browser/render_process_host.h" |
| 76 | 76 |
| 77 #if defined(OS_MACOSX) | 77 #if defined(OS_MACOSX) |
| 78 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 78 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 79 #include "chrome/browser/ui/startup/obsolete_os_prompt.h" | |
| 80 #endif | 79 #endif |
| 81 | 80 |
| 82 #if defined(TOOLKIT_VIEWS) | 81 #if defined(TOOLKIT_VIEWS) |
| 83 #include "chrome/browser/ui/browser_view_prefs.h" | 82 #include "chrome/browser/ui/browser_view_prefs.h" |
| 84 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" | 83 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" |
| 85 #endif | 84 #endif |
| 86 | 85 |
| 87 #if defined(TOOLKIT_GTK) | 86 #if defined(TOOLKIT_GTK) |
| 88 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 87 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 89 #endif | 88 #endif |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 chromeos::UserManager::RegisterPrefs(local_state); | 178 chromeos::UserManager::RegisterPrefs(local_state); |
| 180 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); | 179 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |
| 181 chromeos::signed_settings_cache::RegisterPrefs(local_state); | 180 chromeos::signed_settings_cache::RegisterPrefs(local_state); |
| 182 chromeos::WallpaperManager::RegisterPrefs(local_state); | 181 chromeos::WallpaperManager::RegisterPrefs(local_state); |
| 183 chromeos::WizardController::RegisterPrefs(local_state); | 182 chromeos::WizardController::RegisterPrefs(local_state); |
| 184 policy::AutoEnrollmentClient::RegisterPrefs(local_state); | 183 policy::AutoEnrollmentClient::RegisterPrefs(local_state); |
| 185 policy::DeviceStatusCollector::RegisterPrefs(local_state); | 184 policy::DeviceStatusCollector::RegisterPrefs(local_state); |
| 186 #endif | 185 #endif |
| 187 | 186 |
| 188 #if defined(OS_MACOSX) | 187 #if defined(OS_MACOSX) |
| 189 RegisterObsoleteOSInfobarPrefs(local_state); | |
| 190 confirm_quit::RegisterLocalState(local_state); | 188 confirm_quit::RegisterLocalState(local_state); |
| 191 #endif | 189 #endif |
| 192 } | 190 } |
| 193 | 191 |
| 194 void RegisterUserPrefs(PrefService* user_prefs) { | 192 void RegisterUserPrefs(PrefService* user_prefs) { |
| 195 // User prefs | 193 // User prefs |
| 196 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); | 194 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); |
| 197 AutofillManager::RegisterUserPrefs(user_prefs); | 195 AutofillManager::RegisterUserPrefs(user_prefs); |
| 198 bookmark_utils::RegisterUserPrefs(user_prefs); | 196 bookmark_utils::RegisterUserPrefs(user_prefs); |
| 199 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); | 197 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 } | 327 } |
| 330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 328 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 331 | 329 |
| 332 current_version |= GOOGLE_URL_TRACKER_PREFS; | 330 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 331 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 334 current_version); | 332 current_version); |
| 335 } | 333 } |
| 336 } | 334 } |
| 337 | 335 |
| 338 } // namespace chrome | 336 } // namespace chrome |
| OLD | NEW |