Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
| 8 #include "base/debug/trace_event.h" | |
| 8 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 9 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/about_flags.h" | 11 #include "chrome/browser/about_flags.h" |
| 11 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 12 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 12 #include "chrome/browser/background/background_mode_manager.h" | 13 #include "chrome/browser/background/background_mode_manager.h" |
| 13 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" | 14 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" |
| 14 #include "chrome/browser/bookmarks/bookmark_utils.h" | 15 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 15 #include "chrome/browser/browser_process_impl.h" | 16 #include "chrome/browser/browser_process_impl.h" |
| 16 #include "chrome/browser/browser_shutdown.h" | 17 #include "chrome/browser/browser_shutdown.h" |
| 17 #include "chrome/browser/chrome_content_browser_client.h" | 18 #include "chrome/browser/chrome_content_browser_client.h" |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 272 policy::AutoEnrollmentClient::RegisterPrefs(registry); | 273 policy::AutoEnrollmentClient::RegisterPrefs(registry); |
| 273 policy::DeviceStatusCollector::RegisterPrefs(registry); | 274 policy::DeviceStatusCollector::RegisterPrefs(registry); |
| 274 #endif | 275 #endif |
| 275 | 276 |
| 276 #if defined(OS_MACOSX) | 277 #if defined(OS_MACOSX) |
| 277 confirm_quit::RegisterLocalState(registry); | 278 confirm_quit::RegisterLocalState(registry); |
| 278 #endif | 279 #endif |
| 279 } | 280 } |
| 280 | 281 |
| 281 void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry) { | 282 void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 283 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs") | |
|
battre
2013/06/03 20:24:21
nit: all TRACE_EVENT0 usage that I found in code s
| |
| 282 // User prefs. Please keep this list alphabetized. | 284 // User prefs. Please keep this list alphabetized. |
| 283 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); | 285 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); |
| 284 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); | 286 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); |
| 285 autofill::AutofillManager::RegisterUserPrefs(registry); | 287 autofill::AutofillManager::RegisterUserPrefs(registry); |
| 286 BookmarkPromptPrefs::RegisterUserPrefs(registry); | 288 BookmarkPromptPrefs::RegisterUserPrefs(registry); |
| 287 bookmark_utils::RegisterUserPrefs(registry); | 289 bookmark_utils::RegisterUserPrefs(registry); |
| 288 browser_sync::SyncPrefs::RegisterUserPrefs(registry); | 290 browser_sync::SyncPrefs::RegisterUserPrefs(registry); |
| 289 chrome::RegisterInstantUserPrefs(registry); | 291 chrome::RegisterInstantUserPrefs(registry); |
| 290 ChromeContentBrowserClient::RegisterUserPrefs(registry); | 292 ChromeContentBrowserClient::RegisterUserPrefs(registry); |
| 291 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); | 293 ChromeDownloadManagerDelegate::RegisterUserPrefs(registry); |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 463 } | 465 } |
| 464 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 466 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 465 | 467 |
| 466 current_version |= GOOGLE_URL_TRACKER_PREFS; | 468 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 467 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 469 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 468 current_version); | 470 current_version); |
| 469 } | 471 } |
| 470 } | 472 } |
| 471 | 473 |
| 472 } // namespace chrome | 474 } // namespace chrome |
| OLD | NEW |