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/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.h" |
9 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/bookmarks/bookmark_utils.h" |
12 #include "chrome/browser/browser_shutdown.h" | 13 #include "chrome/browser/browser_shutdown.h" |
13 #include "chrome/browser/content_settings/host_content_settings_map.h" | 14 #include "chrome/browser/content_settings/host_content_settings_map.h" |
14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
15 #include "chrome/browser/debugger/devtools_window.h" | 16 #include "chrome/browser/debugger/devtools_window.h" |
16 #include "chrome/browser/download/download_prefs.h" | 17 #include "chrome/browser/download/download_prefs.h" |
17 #include "chrome/browser/extensions/api/commands/extension_command_service.h" | 18 #include "chrome/browser/extensions/api/commands/extension_command_service.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 #include "chrome/browser/upgrade_detector.h" | 71 #include "chrome/browser/upgrade_detector.h" |
71 #include "chrome/browser/web_resource/promo_resource_service.h" | 72 #include "chrome/browser/web_resource/promo_resource_service.h" |
72 #include "chrome/common/pref_names.h" | 73 #include "chrome/common/pref_names.h" |
73 #include "content/public/browser/render_process_host.h" | 74 #include "content/public/browser/render_process_host.h" |
74 | 75 |
75 #if defined(OS_MACOSX) | 76 #if defined(OS_MACOSX) |
76 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 77 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
77 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h" | 78 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h" |
78 #endif | 79 #endif |
79 | 80 |
80 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | |
81 #include "chrome/browser/accessibility/invert_bubble_views.h" | |
82 #endif | |
83 | |
84 #if defined(TOOLKIT_GTK) | 81 #if defined(TOOLKIT_GTK) |
85 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 82 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
86 #endif | 83 #endif |
87 | 84 |
88 #if defined(OS_CHROMEOS) | 85 #if defined(OS_CHROMEOS) |
89 #include "chrome/browser/chromeos/audio/audio_handler.h" | 86 #include "chrome/browser/chromeos/audio/audio_handler.h" |
90 #include "chrome/browser/chromeos/customization_document.h" | 87 #include "chrome/browser/chromeos/customization_document.h" |
91 #include "chrome/browser/chromeos/login/signed_settings_cache.h" | 88 #include "chrome/browser/chromeos/login/signed_settings_cache.h" |
92 #include "chrome/browser/chromeos/login/user_manager.h" | 89 #include "chrome/browser/chromeos/login/user_manager.h" |
93 #include "chrome/browser/chromeos/login/wizard_controller.h" | 90 #include "chrome/browser/chromeos/login/wizard_controller.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 SessionStartupPref::RegisterUserPrefs(user_prefs); | 197 SessionStartupPref::RegisterUserPrefs(user_prefs); |
201 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 198 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
202 TranslatePrefs::RegisterUserPrefs(user_prefs); | 199 TranslatePrefs::RegisterUserPrefs(user_prefs); |
203 web_intents::RegisterUserPrefs(user_prefs); | 200 web_intents::RegisterUserPrefs(user_prefs); |
204 | 201 |
205 #if defined(ENABLE_CONFIGURATION_POLICY) | 202 #if defined(ENABLE_CONFIGURATION_POLICY) |
206 policy::URLBlacklistManager::RegisterPrefs(user_prefs); | 203 policy::URLBlacklistManager::RegisterPrefs(user_prefs); |
207 #endif | 204 #endif |
208 | 205 |
209 #if defined(TOOLKIT_VIEWS) | 206 #if defined(TOOLKIT_VIEWS) |
210 InvertBubble::RegisterUserPrefs(user_prefs); | 207 browser::RegisterInvertBubbleUserPrefs(user_prefs); |
211 #elif defined(TOOLKIT_GTK) | 208 #elif defined(TOOLKIT_GTK) |
212 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 209 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
213 #endif | 210 #endif |
214 | 211 |
215 #if defined(USE_ASH) | 212 #if defined(USE_ASH) |
216 ChromeLauncherController::RegisterUserPrefs(user_prefs); | 213 ChromeLauncherController::RegisterUserPrefs(user_prefs); |
217 #endif | 214 #endif |
218 | 215 |
219 #if !defined(OS_ANDROID) | 216 #if !defined(OS_ANDROID) |
220 Browser::RegisterUserPrefs(user_prefs); | 217 Browser::RegisterUserPrefs(user_prefs); |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
306 } | 303 } |
307 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 304 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
308 | 305 |
309 current_version |= GOOGLE_URL_TRACKER_PREFS; | 306 current_version |= GOOGLE_URL_TRACKER_PREFS; |
310 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 307 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
311 current_version); | 308 current_version); |
312 } | 309 } |
313 } | 310 } |
314 | 311 |
315 } // namespace browser | 312 } // namespace browser |
OLD | NEW |