| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 #include "chrome/browser/translate/translate_prefs.h" | 57 #include "chrome/browser/translate/translate_prefs.h" |
| 58 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 58 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
| 59 #include "chrome/browser/ui/browser.h" | 59 #include "chrome/browser/ui/browser.h" |
| 60 #include "chrome/browser/ui/network_profile_bubble_prefs.h" | 60 #include "chrome/browser/ui/network_profile_bubble_prefs.h" |
| 61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 63 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 63 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 64 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 64 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 65 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 65 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 66 #include "chrome/browser/ui/webui/flags_ui.h" | 66 #include "chrome/browser/ui/webui/flags_ui.h" |
| 67 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" | |
| 68 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 67 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 69 #include "chrome/browser/ui/webui/plugins_ui.h" | 68 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 70 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 69 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
| 71 #include "chrome/browser/upgrade_detector.h" | 70 #include "chrome/browser/upgrade_detector.h" |
| 72 #include "chrome/browser/web_resource/promo_resource_service.h" | 71 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 73 #include "chrome/common/pref_names.h" | 72 #include "chrome/common/pref_names.h" |
| 74 #include "content/public/browser/render_process_host.h" | 73 #include "content/public/browser/render_process_host.h" |
| 75 | 74 |
| 76 #if defined(OS_MACOSX) | 75 #if defined(OS_MACOSX) |
| 77 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 76 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 browser::RegisterBrowserViewPrefs(local_state); | 143 browser::RegisterBrowserViewPrefs(local_state); |
| 145 browser::RegisterTabStripLayoutTypePrefs(local_state); | 144 browser::RegisterTabStripLayoutTypePrefs(local_state); |
| 146 #endif | 145 #endif |
| 147 | 146 |
| 148 #if !defined(OS_ANDROID) | 147 #if !defined(OS_ANDROID) |
| 149 AppsPromo::RegisterPrefs(local_state); | 148 AppsPromo::RegisterPrefs(local_state); |
| 150 BackgroundModeManager::RegisterPrefs(local_state); | 149 BackgroundModeManager::RegisterPrefs(local_state); |
| 151 Browser::RegisterPrefs(local_state); | 150 Browser::RegisterPrefs(local_state); |
| 152 FlagsUI::RegisterPrefs(local_state); | 151 FlagsUI::RegisterPrefs(local_state); |
| 153 ManagedMode::RegisterPrefs(local_state); | 152 ManagedMode::RegisterPrefs(local_state); |
| 154 NewTabPageHandler::RegisterPrefs(local_state); | |
| 155 PromoResourceService::RegisterPrefs(local_state); | 153 PromoResourceService::RegisterPrefs(local_state); |
| 156 UpgradeDetector::RegisterPrefs(local_state); | 154 UpgradeDetector::RegisterPrefs(local_state); |
| 157 #endif | 155 #endif |
| 158 | 156 |
| 159 #if defined(ENABLE_PRINTING) | 157 #if defined(ENABLE_PRINTING) |
| 160 printing::PrintJobManager::RegisterPrefs(local_state); | 158 printing::PrintJobManager::RegisterPrefs(local_state); |
| 161 #endif | 159 #endif |
| 162 | 160 |
| 163 #if defined(OS_CHROMEOS) | 161 #if defined(OS_CHROMEOS) |
| 164 chromeos::AudioHandler::RegisterPrefs(local_state); | 162 chromeos::AudioHandler::RegisterPrefs(local_state); |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 } | 317 } |
| 320 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 318 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 321 | 319 |
| 322 current_version |= GOOGLE_URL_TRACKER_PREFS; | 320 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 323 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 321 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 324 current_version); | 322 current_version); |
| 325 } | 323 } |
| 326 } | 324 } |
| 327 | 325 |
| 328 } // namespace browser | 326 } // namespace browser |
| OLD | NEW |