Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 11620012: [Profiles, Fixit] Making GAIAInfoUpdateService into a ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing RegisterUserPrefs Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 30 matching lines...) Expand all
41 #include "chrome/browser/notifications/desktop_notification_service.h" 41 #include "chrome/browser/notifications/desktop_notification_service.h"
42 #include "chrome/browser/notifications/notification_prefs_manager.h" 42 #include "chrome/browser/notifications/notification_prefs_manager.h"
43 #include "chrome/browser/page_info_model.h" 43 #include "chrome/browser/page_info_model.h"
44 #include "chrome/browser/password_manager/password_manager.h" 44 #include "chrome/browser/password_manager/password_manager.h"
45 #include "chrome/browser/pepper_flash_settings_manager.h" 45 #include "chrome/browser/pepper_flash_settings_manager.h"
46 #include "chrome/browser/plugins/plugin_finder.h" 46 #include "chrome/browser/plugins/plugin_finder.h"
47 #include "chrome/browser/prefs/incognito_mode_prefs.h" 47 #include "chrome/browser/prefs/incognito_mode_prefs.h"
48 #include "chrome/browser/prefs/pref_service.h" 48 #include "chrome/browser/prefs/pref_service.h"
49 #include "chrome/browser/prefs/session_startup_pref.h" 49 #include "chrome/browser/prefs/session_startup_pref.h"
50 #include "chrome/browser/profiles/chrome_version_service.h" 50 #include "chrome/browser/profiles/chrome_version_service.h"
51 #include "chrome/browser/profiles/gaia_info_update_service.h"
52 #include "chrome/browser/profiles/profile_impl.h" 51 #include "chrome/browser/profiles/profile_impl.h"
53 #include "chrome/browser/profiles/profile_info_cache.h" 52 #include "chrome/browser/profiles/profile_info_cache.h"
54 #include "chrome/browser/profiles/profile_manager.h" 53 #include "chrome/browser/profiles/profile_manager.h"
55 #include "chrome/browser/renderer_host/web_cache_manager.h" 54 #include "chrome/browser/renderer_host/web_cache_manager.h"
56 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 55 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
57 #include "chrome/browser/signin/signin_manager_factory.h" 56 #include "chrome/browser/signin/signin_manager_factory.h"
58 #include "chrome/browser/task_manager/task_manager.h" 57 #include "chrome/browser/task_manager/task_manager.h"
59 #include "chrome/browser/translate/translate_prefs.h" 58 #include "chrome/browser/translate/translate_prefs.h"
60 #include "chrome/browser/ui/alternate_error_tab_observer.h" 59 #include "chrome/browser/ui/alternate_error_tab_observer.h"
61 #include "chrome/browser/ui/browser_instant_controller.h" 60 #include "chrome/browser/ui/browser_instant_controller.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 BrowserInstantController::RegisterUserPrefs(user_prefs); 226 BrowserInstantController::RegisterUserPrefs(user_prefs);
228 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs); 227 ChromeContentBrowserClient::RegisterUserPrefs(user_prefs);
229 ChromeVersionService::RegisterUserPrefs(user_prefs); 228 ChromeVersionService::RegisterUserPrefs(user_prefs);
230 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); 229 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs);
231 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); 230 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs);
232 DownloadPrefs::RegisterUserPrefs(user_prefs); 231 DownloadPrefs::RegisterUserPrefs(user_prefs);
233 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); 232 extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
234 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); 233 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
235 ExtensionWebUI::RegisterUserPrefs(user_prefs); 234 ExtensionWebUI::RegisterUserPrefs(user_prefs);
236 first_run::RegisterUserPrefs(user_prefs); 235 first_run::RegisterUserPrefs(user_prefs);
237 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs);
238 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 236 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
239 IncognitoModePrefs::RegisterUserPrefs(user_prefs); 237 IncognitoModePrefs::RegisterUserPrefs(user_prefs);
240 InstantUI::RegisterUserPrefs(user_prefs); 238 InstantUI::RegisterUserPrefs(user_prefs);
241 MediaCaptureDevicesDispatcher::RegisterUserPrefs(user_prefs); 239 MediaCaptureDevicesDispatcher::RegisterUserPrefs(user_prefs);
242 MediaStreamDevicesController::RegisterUserPrefs(user_prefs); 240 MediaStreamDevicesController::RegisterUserPrefs(user_prefs);
243 NetPrefObserver::RegisterPrefs(user_prefs); 241 NetPrefObserver::RegisterPrefs(user_prefs);
244 NewTabUI::RegisterUserPrefs(user_prefs); 242 NewTabUI::RegisterUserPrefs(user_prefs);
245 PasswordManager::RegisterUserPrefs(user_prefs); 243 PasswordManager::RegisterUserPrefs(user_prefs);
246 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); 244 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs);
247 PrefsTabHelper::RegisterUserPrefs(user_prefs); 245 PrefsTabHelper::RegisterUserPrefs(user_prefs);
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 } 374 }
377 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 375 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
378 376
379 current_version |= GOOGLE_URL_TRACKER_PREFS; 377 current_version |= GOOGLE_URL_TRACKER_PREFS;
380 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 378 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
381 current_version); 379 current_version);
382 } 380 }
383 } 381 }
384 382
385 } // namespace chrome 383 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698