| 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/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/about_flags.h" | 10 #include "chrome/browser/about_flags.h" |
| 11 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 11 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 12 #include "chrome/browser/autofill/autofill_manager.h" | |
| 13 #include "chrome/browser/background/background_mode_manager.h" | 12 #include "chrome/browser/background/background_mode_manager.h" |
| 14 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" | 13 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" |
| 15 #include "chrome/browser/bookmarks/bookmark_utils.h" | 14 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 16 #include "chrome/browser/browser_process_impl.h" | 15 #include "chrome/browser/browser_process_impl.h" |
| 17 #include "chrome/browser/browser_shutdown.h" | 16 #include "chrome/browser/browser_shutdown.h" |
| 18 #include "chrome/browser/chrome_content_browser_client.h" | 17 #include "chrome/browser/chrome_content_browser_client.h" |
| 19 #include "chrome/browser/component_updater/recovery_component_installer.h" | 18 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 20 #include "chrome/browser/content_settings/host_content_settings_map.h" | 19 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 22 #include "chrome/browser/devtools/devtools_window.h" | 21 #include "chrome/browser/devtools/devtools_window.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 #include "chrome/browser/ui/webui/flags_ui.h" | 81 #include "chrome/browser/ui/webui/flags_ui.h" |
| 83 #include "chrome/browser/ui/webui/instant_ui.h" | 82 #include "chrome/browser/ui/webui/instant_ui.h" |
| 84 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 83 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 85 #include "chrome/browser/ui/webui/plugins_ui.h" | 84 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 86 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 85 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
| 87 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 86 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
| 88 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" | 87 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" |
| 89 #include "chrome/browser/upgrade_detector.h" | 88 #include "chrome/browser/upgrade_detector.h" |
| 90 #include "chrome/browser/web_resource/promo_resource_service.h" | 89 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 91 #include "chrome/common/pref_names.h" | 90 #include "chrome/common/pref_names.h" |
| 91 #include "components/autofill/browser/autofill_manager.h" |
| 92 #include "components/user_prefs/pref_registry_syncable.h" | 92 #include "components/user_prefs/pref_registry_syncable.h" |
| 93 #include "content/public/browser/render_process_host.h" | 93 #include "content/public/browser/render_process_host.h" |
| 94 | 94 |
| 95 #if defined(ENABLE_CONFIGURATION_POLICY) | 95 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 96 #include "chrome/browser/policy/browser_policy_connector.h" | 96 #include "chrome/browser/policy/browser_policy_connector.h" |
| 97 #include "chrome/browser/policy/policy_statistics_collector.h" | 97 #include "chrome/browser/policy/policy_statistics_collector.h" |
| 98 #include "chrome/browser/policy/url_blacklist_manager.h" | 98 #include "chrome/browser/policy/url_blacklist_manager.h" |
| 99 #endif | 99 #endif |
| 100 | 100 |
| 101 #if defined(OS_MACOSX) | 101 #if defined(OS_MACOSX) |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 } | 433 } |
| 434 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 434 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 435 | 435 |
| 436 current_version |= GOOGLE_URL_TRACKER_PREFS; | 436 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 437 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 437 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 438 current_version); | 438 current_version); |
| 439 } | 439 } |
| 440 } | 440 } |
| 441 | 441 |
| 442 } // namespace chrome | 442 } // namespace chrome |
| OLD | NEW |