chrome/browser/prefs/browser_prefs.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 months 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

« no previous file with comments | « chrome/browser/predictors/resource_prefetch_common.cc ('k') | chrome/browser/prefs/chrome_pref_service_factory.cc » ('j') | no next file with comments »

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 "base/prefs/pref_registry_simple.h"

	8 #include "base/prefs/pref_service.h"

7 #include "chrome/browser/about_flags.h"	9 #include "chrome/browser/about_flags.h"

8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"	10 #include "chrome/browser/accessibility/invert_bubble_prefs.h"

9 #include "chrome/browser/autofill/autofill_manager.h"	11 #include "chrome/browser/autofill/autofill_manager.h"

10 #include "chrome/browser/background/background_mode_manager.h"	12 #include "chrome/browser/background/background_mode_manager.h"

11 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h"	13 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h"

12 #include "chrome/browser/bookmarks/bookmark_utils.h"	14 #include "chrome/browser/bookmarks/bookmark_utils.h"

13 #include "chrome/browser/browser_process_impl.h"	15 #include "chrome/browser/browser_process_impl.h"

14 #include "chrome/browser/browser_shutdown.h"	16 #include "chrome/browser/browser_shutdown.h"

15 #include "chrome/browser/chrome_content_browser_client.h"	17 #include "chrome/browser/chrome_content_browser_client.h"

16 #include "chrome/browser/content_settings/host_content_settings_map.h"	18 #include "chrome/browser/content_settings/host_content_settings_map.h"

(...skipping 23 matching lines...) Expand all Loading...
40 #include "chrome/browser/net/http_server_properties_manager.h"	42 #include "chrome/browser/net/http_server_properties_manager.h"

41 #include "chrome/browser/net/net_pref_observer.h"	43 #include "chrome/browser/net/net_pref_observer.h"

42 #include "chrome/browser/net/predictor.h"	44 #include "chrome/browser/net/predictor.h"

43 #include "chrome/browser/net/ssl_config_service_manager.h"	45 #include "chrome/browser/net/ssl_config_service_manager.h"

44 #include "chrome/browser/notifications/desktop_notification_service.h"	46 #include "chrome/browser/notifications/desktop_notification_service.h"

45 #include "chrome/browser/notifications/notification_prefs_manager.h"	47 #include "chrome/browser/notifications/notification_prefs_manager.h"

46 #include "chrome/browser/password_manager/password_manager.h"	48 #include "chrome/browser/password_manager/password_manager.h"

47 #include "chrome/browser/pepper_flash_settings_manager.h"	49 #include "chrome/browser/pepper_flash_settings_manager.h"

48 #include "chrome/browser/plugins/plugin_finder.h"	50 #include "chrome/browser/plugins/plugin_finder.h"

49 #include "chrome/browser/prefs/incognito_mode_prefs.h"	51 #include "chrome/browser/prefs/incognito_mode_prefs.h"

50 #include "chrome/browser/prefs/pref_registry_simple.h"

51 #include "chrome/browser/prefs/pref_registry_syncable.h"	52 #include "chrome/browser/prefs/pref_registry_syncable.h"

52 #include "chrome/browser/prefs/pref_service.h"

53 #include "chrome/browser/prefs/pref_service_syncable.h"	53 #include "chrome/browser/prefs/pref_service_syncable.h"

54 #include "chrome/browser/prefs/session_startup_pref.h"	54 #include "chrome/browser/prefs/session_startup_pref.h"

55 #include "chrome/browser/profiles/chrome_version_service.h"	55 #include "chrome/browser/profiles/chrome_version_service.h"

56 #include "chrome/browser/profiles/profile_impl.h"	56 #include "chrome/browser/profiles/profile_impl.h"

57 #include "chrome/browser/profiles/profile_info_cache.h"	57 #include "chrome/browser/profiles/profile_info_cache.h"

58 #include "chrome/browser/profiles/profile_manager.h"	58 #include "chrome/browser/profiles/profile_manager.h"

59 #include "chrome/browser/renderer_host/web_cache_manager.h"	59 #include "chrome/browser/renderer_host/web_cache_manager.h"

60 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"	60 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"

61 #include "chrome/browser/signin/signin_manager_factory.h"	61 #include "chrome/browser/signin/signin_manager_factory.h"

62 #include "chrome/browser/sync/sync_prefs.h"	62 #include "chrome/browser/sync/sync_prefs.h"

(...skipping 352 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
415 }	415 }

416 local_state->ClearPref(prefs::kLastPromptedGoogleURL);	416 local_state->ClearPref(prefs::kLastPromptedGoogleURL);

417	417

418 current_version \|= GOOGLE_URL_TRACKER_PREFS;	418 current_version \|= GOOGLE_URL_TRACKER_PREFS;

419 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,	419 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,

420 current_version);	420 current_version);

421 }	421 }

422 }	422 }

423	423

424 } // namespace chrome	424 } // namespace chrome

OLD	NEW