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/debug/trace_event.h" |
9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
11 #include "chrome/browser/about_flags.h" | 11 #include "chrome/browser/about_flags.h" |
12 #if defined(OS_ANDROID) | |
13 #include "chrome/browser/android/new_tab_page_prefs.h" | |
newt (away)
2013/10/30 23:47:51
platform-specific defines should go at the end of
apiccion
2013/11/01 23:30:32
Done.
| |
14 #endif | |
12 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 15 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
13 #include "chrome/browser/apps/shortcut_manager.h" | 16 #include "chrome/browser/apps/shortcut_manager.h" |
14 #include "chrome/browser/background/background_mode_manager.h" | 17 #include "chrome/browser/background/background_mode_manager.h" |
15 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" | 18 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" |
16 #include "chrome/browser/bookmarks/bookmark_utils.h" | 19 #include "chrome/browser/bookmarks/bookmark_utils.h" |
17 #include "chrome/browser/browser_process_impl.h" | 20 #include "chrome/browser/browser_process_impl.h" |
18 #include "chrome/browser/browser_shutdown.h" | 21 #include "chrome/browser/browser_shutdown.h" |
19 #include "chrome/browser/chrome_content_browser_client.h" | 22 #include "chrome/browser/chrome_content_browser_client.h" |
20 #include "chrome/browser/component_updater/recovery_component_installer.h" | 23 #include "chrome/browser/component_updater/recovery_component_installer.h" |
21 #include "chrome/browser/content_settings/host_content_settings_map.h" | 24 #include "chrome/browser/content_settings/host_content_settings_map.h" |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
353 PrefsTabHelper::RegisterProfilePrefs(registry); | 356 PrefsTabHelper::RegisterProfilePrefs(registry); |
354 Profile::RegisterProfilePrefs(registry); | 357 Profile::RegisterProfilePrefs(registry); |
355 ProfileImpl::RegisterProfilePrefs(registry); | 358 ProfileImpl::RegisterProfilePrefs(registry); |
356 PromoResourceService::RegisterProfilePrefs(registry); | 359 PromoResourceService::RegisterProfilePrefs(registry); |
357 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); | 360 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); |
358 RegisterBrowserUserPrefs(registry); | 361 RegisterBrowserUserPrefs(registry); |
359 SessionStartupPref::RegisterProfilePrefs(registry); | 362 SessionStartupPref::RegisterProfilePrefs(registry); |
360 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); | 363 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |
361 TranslatePrefs::RegisterProfilePrefs(registry); | 364 TranslatePrefs::RegisterProfilePrefs(registry); |
362 | 365 |
366 #if defined(OS_ANDROID) | |
367 NewTabPagePrefs::RegisterProfilePrefs(registry); | |
368 #endif | |
369 | |
363 #if defined(ENABLE_AUTOFILL_DIALOG) | 370 #if defined(ENABLE_AUTOFILL_DIALOG) |
364 autofill::AutofillDialogController::RegisterProfilePrefs(registry); | 371 autofill::AutofillDialogController::RegisterProfilePrefs(registry); |
365 #endif | 372 #endif |
366 | 373 |
367 #if defined(ENABLE_CONFIGURATION_POLICY) | 374 #if defined(ENABLE_CONFIGURATION_POLICY) |
368 policy::URLBlacklistManager::RegisterProfilePrefs(registry); | 375 policy::URLBlacklistManager::RegisterProfilePrefs(registry); |
369 #endif | 376 #endif |
370 | 377 |
371 #if defined(ENABLE_EXTENSIONS) | 378 #if defined(ENABLE_EXTENSIONS) |
372 extensions::ActivityLog::RegisterProfilePrefs(registry); | 379 extensions::ActivityLog::RegisterProfilePrefs(registry); |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
559 } | 566 } |
560 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 567 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
561 | 568 |
562 current_version |= GOOGLE_URL_TRACKER_PREFS; | 569 current_version |= GOOGLE_URL_TRACKER_PREFS; |
563 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 570 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
564 current_version); | 571 current_version); |
565 } | 572 } |
566 } | 573 } |
567 | 574 |
568 } // namespace chrome | 575 } // namespace chrome |
OLD | NEW |