Chromium Code Reviews| 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 "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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 52 #include "chrome/browser/profiles/profile_impl.h" | 52 #include "chrome/browser/profiles/profile_impl.h" |
| 53 #include "chrome/browser/profiles/profile_info_cache.h" | 53 #include "chrome/browser/profiles/profile_info_cache.h" |
| 54 #include "chrome/browser/profiles/profile_manager.h" | 54 #include "chrome/browser/profiles/profile_manager.h" |
| 55 #include "chrome/browser/renderer_host/web_cache_manager.h" | 55 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 56 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 56 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 57 #include "chrome/browser/signin/signin_manager_factory.h" | 57 #include "chrome/browser/signin/signin_manager_factory.h" |
| 58 #include "chrome/browser/sync/sync_prefs.h" | 58 #include "chrome/browser/sync/sync_prefs.h" |
| 59 #include "chrome/browser/task_manager/task_manager.h" | 59 #include "chrome/browser/task_manager/task_manager.h" |
| 60 #include "chrome/browser/translate/translate_prefs.h" | 60 #include "chrome/browser/translate/translate_prefs.h" |
| 61 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 61 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
| 62 #include "chrome/browser/ui/app_list/app_list_util.h" | |
| 62 #include "chrome/browser/ui/browser_instant_controller.h" | 63 #include "chrome/browser/ui/browser_instant_controller.h" |
| 63 #include "chrome/browser/ui/browser_ui_prefs.h" | 64 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 64 #include "chrome/browser/ui/network_profile_bubble.h" | 65 #include "chrome/browser/ui/network_profile_bubble.h" |
| 65 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 66 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 66 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 67 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 67 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 68 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 68 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 69 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 69 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 70 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 70 #include "chrome/browser/ui/webui/flags_ui.h" | 71 #include "chrome/browser/ui/webui/flags_ui.h" |
| 71 #include "chrome/browser/ui/webui/instant_ui.h" | 72 #include "chrome/browser/ui/webui/instant_ui.h" |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 213 chromeos::UserManager::RegisterPrefs(local_state); | 214 chromeos::UserManager::RegisterPrefs(local_state); |
| 214 chromeos::WallpaperManager::RegisterPrefs(local_state); | 215 chromeos::WallpaperManager::RegisterPrefs(local_state); |
| 215 chromeos::WizardController::RegisterPrefs(local_state); | 216 chromeos::WizardController::RegisterPrefs(local_state); |
| 216 policy::AutoEnrollmentClient::RegisterPrefs(local_state); | 217 policy::AutoEnrollmentClient::RegisterPrefs(local_state); |
| 217 policy::DeviceStatusCollector::RegisterPrefs(local_state); | 218 policy::DeviceStatusCollector::RegisterPrefs(local_state); |
| 218 #endif | 219 #endif |
| 219 | 220 |
| 220 #if defined(OS_MACOSX) | 221 #if defined(OS_MACOSX) |
| 221 confirm_quit::RegisterLocalState(local_state); | 222 confirm_quit::RegisterLocalState(local_state); |
| 222 #endif | 223 #endif |
| 224 | |
| 225 #if defined(ENABLE_APP_LIST) | |
|
tapted
2013/01/26 01:10:08
This will be true on CrOS, so it should be ENABLE_
koz (OOO until 15th September)
2013/01/29 00:34:11
Done.
| |
| 226 chrome::RegisterAppListPrefs(local_state); | |
|
tapted
2013/01/26 01:10:08
Otherwise CrOS will need a definition of this in a
| |
| 227 #endif | |
| 223 } | 228 } |
| 224 | 229 |
| 225 void RegisterUserPrefs(PrefServiceSyncable* user_prefs) { | 230 void RegisterUserPrefs(PrefServiceSyncable* user_prefs) { |
| 226 // User prefs. Please keep this list alphabetized. | 231 // User prefs. Please keep this list alphabetized. |
| 227 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); | 232 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); |
| 228 AutofillManager::RegisterUserPrefs(user_prefs); | 233 AutofillManager::RegisterUserPrefs(user_prefs); |
| 229 BookmarkPromptPrefs::RegisterUserPrefs(user_prefs); | 234 BookmarkPromptPrefs::RegisterUserPrefs(user_prefs); |
| 230 bookmark_utils::RegisterUserPrefs(user_prefs); | 235 bookmark_utils::RegisterUserPrefs(user_prefs); |
| 231 BrowserInstantController::RegisterUserPrefs(user_prefs); | 236 BrowserInstantController::RegisterUserPrefs(user_prefs); |
| 232 browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs); | 237 browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs); |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 384 } | 389 } |
| 385 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 390 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 386 | 391 |
| 387 current_version |= GOOGLE_URL_TRACKER_PREFS; | 392 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 388 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 393 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 389 current_version); | 394 current_version); |
| 390 } | 395 } |
| 391 } | 396 } |
| 392 | 397 |
| 393 } // namespace chrome | 398 } // namespace chrome |
| OLD | NEW |