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

Side by Side Diff: chrome/browser/profiles/profile_manager.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/profiles/profile_keyed_base_factory.cc ('k') | chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <set>	5 #include <set>

6	6

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

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/file_path.h"	11 #include "base/file_path.h"

12 #include "base/file_util.h"	12 #include "base/file_util.h"

13 #include "base/metrics/histogram.h"	13 #include "base/metrics/histogram.h"

	14 #include "base/prefs/pref_registry_simple.h"

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

14 #include "base/string_util.h"	16 #include "base/string_util.h"

15 #include "base/strings/string_number_conversions.h"	17 #include "base/strings/string_number_conversions.h"

16 #include "base/utf_string_conversions.h"	18 #include "base/utf_string_conversions.h"

17 #include "chrome/browser/bookmarks/bookmark_model.h"	19 #include "chrome/browser/bookmarks/bookmark_model.h"

18 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	20 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

19 #include "chrome/browser/browser_process.h"	21 #include "chrome/browser/browser_process.h"

20 #include "chrome/browser/content_settings/host_content_settings_map.h"	22 #include "chrome/browser/content_settings/host_content_settings_map.h"

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

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

23 #include "chrome/browser/prefs/scoped_user_pref_update.h"	23 #include "chrome/browser/prefs/scoped_user_pref_update.h"

24 #include "chrome/browser/profiles/bookmark_model_loaded_observer.h"	24 #include "chrome/browser/profiles/bookmark_model_loaded_observer.h"

25 #include "chrome/browser/profiles/profile_destroyer.h"	25 #include "chrome/browser/profiles/profile_destroyer.h"

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

27 #include "chrome/browser/profiles/profile_metrics.h"	27 #include "chrome/browser/profiles/profile_metrics.h"

28 #include "chrome/browser/sync/profile_sync_service.h"	28 #include "chrome/browser/sync/profile_sync_service.h"

29 #include "chrome/browser/sync/profile_sync_service_factory.h"	29 #include "chrome/browser/sync/profile_sync_service_factory.h"

30 #include "chrome/browser/ui/browser.h"	30 #include "chrome/browser/ui/browser.h"

31 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"	31 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"

32 #include "chrome/common/chrome_constants.h"	32 #include "chrome/common/chrome_constants.h"

(...skipping 1073 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1106 ProfileManager::ProfileInfo::ProfileInfo(	1106 ProfileManager::ProfileInfo::ProfileInfo(

1107 Profile* profile,	1107 Profile* profile,

1108 bool created)	1108 bool created)

1109 : profile(profile),	1109 : profile(profile),

1110 created(created) {	1110 created(created) {

1111 }	1111 }

1112	1112

1113 ProfileManager::ProfileInfo::~ProfileInfo() {	1113 ProfileManager::ProfileInfo::~ProfileInfo() {

1114 ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());	1114 ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());

1115 }	1115 }

OLD	NEW