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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 45 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
46 #include "chrome/browser/prefs/pref_service.h" | 46 #include "chrome/browser/prefs/pref_service.h" |
47 #include "chrome/browser/prefs/session_startup_pref.h" | 47 #include "chrome/browser/prefs/session_startup_pref.h" |
48 #include "chrome/browser/profiles/chrome_version_service.h" | 48 #include "chrome/browser/profiles/chrome_version_service.h" |
49 #include "chrome/browser/profiles/gaia_info_update_service.h" | 49 #include "chrome/browser/profiles/gaia_info_update_service.h" |
50 #include "chrome/browser/profiles/profile_impl.h" | 50 #include "chrome/browser/profiles/profile_impl.h" |
51 #include "chrome/browser/profiles/profile_info_cache.h" | 51 #include "chrome/browser/profiles/profile_info_cache.h" |
52 #include "chrome/browser/profiles/profile_manager.h" | 52 #include "chrome/browser/profiles/profile_manager.h" |
53 #include "chrome/browser/renderer_host/web_cache_manager.h" | 53 #include "chrome/browser/renderer_host/web_cache_manager.h" |
54 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 54 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 55 #include "chrome/browser/sessions/app_restore_service.h" |
55 #include "chrome/browser/signin/signin_manager_factory.h" | 56 #include "chrome/browser/signin/signin_manager_factory.h" |
56 #include "chrome/browser/task_manager/task_manager.h" | 57 #include "chrome/browser/task_manager/task_manager.h" |
57 #include "chrome/browser/translate/translate_prefs.h" | 58 #include "chrome/browser/translate/translate_prefs.h" |
58 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 59 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
59 #include "chrome/browser/ui/browser_ui_prefs.h" | 60 #include "chrome/browser/ui/browser_ui_prefs.h" |
60 #include "chrome/browser/ui/network_profile_bubble.h" | 61 #include "chrome/browser/ui/network_profile_bubble.h" |
61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 62 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 63 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
63 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 64 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
64 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 65 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 #endif | 188 #endif |
188 | 189 |
189 #if defined(OS_MACOSX) | 190 #if defined(OS_MACOSX) |
190 confirm_quit::RegisterLocalState(local_state); | 191 confirm_quit::RegisterLocalState(local_state); |
191 #endif | 192 #endif |
192 } | 193 } |
193 | 194 |
194 void RegisterUserPrefs(PrefService* user_prefs) { | 195 void RegisterUserPrefs(PrefService* user_prefs) { |
195 // User prefs | 196 // User prefs |
196 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); | 197 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); |
| 198 AppRestoreService::RegisterUserPrefs(user_prefs); |
197 AutofillManager::RegisterUserPrefs(user_prefs); | 199 AutofillManager::RegisterUserPrefs(user_prefs); |
198 bookmark_utils::RegisterUserPrefs(user_prefs); | 200 bookmark_utils::RegisterUserPrefs(user_prefs); |
199 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); | 201 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); |
200 ChromeVersionService::RegisterUserPrefs(user_prefs); | 202 ChromeVersionService::RegisterUserPrefs(user_prefs); |
201 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); | 203 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); |
202 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); | 204 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); |
203 DownloadPrefs::RegisterUserPrefs(user_prefs); | 205 DownloadPrefs::RegisterUserPrefs(user_prefs); |
204 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); | 206 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); |
205 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 207 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
206 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); | 208 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 } | 331 } |
330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 332 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
331 | 333 |
332 current_version |= GOOGLE_URL_TRACKER_PREFS; | 334 current_version |= GOOGLE_URL_TRACKER_PREFS; |
333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 335 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
334 current_version); | 336 current_version); |
335 } | 337 } |
336 } | 338 } |
337 | 339 |
338 } // namespace chrome | 340 } // namespace chrome |
OLD | NEW |