| 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" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 #include "chrome/browser/translate/translate_prefs.h" | 70 #include "chrome/browser/translate/translate_prefs.h" |
| 71 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 71 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
| 72 #include "chrome/browser/ui/app_list/app_list_service.h" | 72 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 73 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" | 73 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" |
| 74 #include "chrome/browser/ui/browser_ui_prefs.h" | 74 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 75 #include "chrome/browser/ui/network_profile_bubble.h" | 75 #include "chrome/browser/ui/network_profile_bubble.h" |
| 76 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 76 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 77 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 77 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 78 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 78 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 79 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 79 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 80 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
| 80 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 81 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 81 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 82 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 82 #include "chrome/browser/ui/webui/flags_ui.h" | 83 #include "chrome/browser/ui/webui/flags_ui.h" |
| 83 #include "chrome/browser/ui/webui/instant_ui.h" | 84 #include "chrome/browser/ui/webui/instant_ui.h" |
| 84 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 85 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 85 #include "chrome/browser/ui/webui/plugins_ui.h" | 86 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 86 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 87 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
| 87 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | |
| 88 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" | 88 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" |
| 89 #include "chrome/browser/upgrade_detector.h" | 89 #include "chrome/browser/upgrade_detector.h" |
| 90 #include "chrome/browser/web_resource/promo_resource_service.h" | 90 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 91 #include "chrome/common/metrics/entropy_provider.h" | 91 #include "chrome/common/metrics/entropy_provider.h" |
| 92 #include "chrome/common/pref_names.h" | 92 #include "chrome/common/pref_names.h" |
| 93 #include "components/autofill/browser/autofill_manager.h" | 93 #include "components/autofill/browser/autofill_manager.h" |
| 94 #include "components/user_prefs/pref_registry_syncable.h" | 94 #include "components/user_prefs/pref_registry_syncable.h" |
| 95 #include "content/public/browser/render_process_host.h" | 95 #include "content/public/browser/render_process_host.h" |
| 96 | 96 |
| 97 #if defined(ENABLE_CONFIGURATION_POLICY) | 97 #if defined(ENABLE_CONFIGURATION_POLICY) |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 } | 465 } |
| 466 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 466 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 467 | 467 |
| 468 current_version |= GOOGLE_URL_TRACKER_PREFS; | 468 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 469 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 469 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 470 current_version); | 470 current_version); |
| 471 } | 471 } |
| 472 } | 472 } |
| 473 | 473 |
| 474 } // namespace chrome | 474 } // namespace chrome |
| OLD | NEW |