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

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 7111013: Move most of the core SSL code from chrome to content. The UI code that's specific to Chrome (i.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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/prefs/browser_prefs.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.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/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "chrome/browser/background_contents_service_factory.h" 17 #include "chrome/browser/background_contents_service_factory.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/content_settings/host_content_settings_map.h" 19 #include "chrome/browser/content_settings/host_content_settings_map.h"
20 #include "chrome/browser/download/download_manager.h" 20 #include "chrome/browser/download/download_manager.h"
21 #include "chrome/browser/extensions/extension_message_service.h" 21 #include "chrome/browser/extensions/extension_message_service.h"
22 #include "chrome/browser/extensions/extension_pref_store.h" 22 #include "chrome/browser/extensions/extension_pref_store.h"
23 #include "chrome/browser/extensions/extension_process_manager.h" 23 #include "chrome/browser/extensions/extension_process_manager.h"
24 #include "chrome/browser/extensions/extension_service.h" 24 #include "chrome/browser/extensions/extension_service.h"
25 #include "chrome/browser/extensions/extension_special_storage_policy.h" 25 #include "chrome/browser/extensions/extension_special_storage_policy.h"
26 #include "chrome/browser/net/pref_proxy_config_service.h" 26 #include "chrome/browser/net/pref_proxy_config_service.h"
27 #include "chrome/browser/prefs/pref_service.h" 27 #include "chrome/browser/prefs/pref_service.h"
28 #include "chrome/browser/profiles/off_the_record_profile_io_data.h" 28 #include "chrome/browser/profiles/off_the_record_profile_io_data.h"
29 #include "chrome/browser/profiles/profile_dependency_manager.h" 29 #include "chrome/browser/profiles/profile_dependency_manager.h"
30 #include "chrome/browser/ssl/ssl_host_state.h"
31 #include "chrome/browser/sync/profile_sync_service.h" 30 #include "chrome/browser/sync/profile_sync_service.h"
32 #include "chrome/browser/themes/theme_service.h" 31 #include "chrome/browser/themes/theme_service.h"
33 #include "chrome/browser/transport_security_persister.h" 32 #include "chrome/browser/transport_security_persister.h"
34 #include "chrome/browser/ui/browser_list.h" 33 #include "chrome/browser/ui/browser_list.h"
35 #include "chrome/browser/ui/find_bar/find_bar_state.h" 34 #include "chrome/browser/ui/find_bar/find_bar_state.h"
36 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 35 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
37 #include "chrome/browser/ui/webui/extension_icon_source.h" 36 #include "chrome/browser/ui/webui/extension_icon_source.h"
38 #include "chrome/common/chrome_constants.h" 37 #include "chrome/common/chrome_constants.h"
39 #include "chrome/common/chrome_paths.h" 38 #include "chrome/common/chrome_paths.h"
40 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/extensions/extension.h" 40 #include "chrome/common/extensions/extension.h"
42 #include "chrome/common/json_pref_store.h" 41 #include "chrome/common/json_pref_store.h"
43 #include "chrome/common/pref_names.h" 42 #include "chrome/common/pref_names.h"
44 #include "chrome/common/render_messages.h" 43 #include "chrome/common/render_messages.h"
45 #include "content/browser/appcache/chrome_appcache_service.h" 44 #include "content/browser/appcache/chrome_appcache_service.h"
46 #include "content/browser/browser_thread.h" 45 #include "content/browser/browser_thread.h"
47 #include "content/browser/chrome_blob_storage_context.h" 46 #include "content/browser/chrome_blob_storage_context.h"
48 #include "content/browser/file_system/browser_file_system_helper.h" 47 #include "content/browser/file_system/browser_file_system_helper.h"
49 #include "content/browser/host_zoom_map.h" 48 #include "content/browser/host_zoom_map.h"
50 #include "content/browser/in_process_webkit/webkit_context.h" 49 #include "content/browser/in_process_webkit/webkit_context.h"
50 #include "content/browser/ssl/ssl_host_state.h"
51 #include "content/common/notification_service.h" 51 #include "content/common/notification_service.h"
52 #include "grit/locale_settings.h" 52 #include "grit/locale_settings.h"
53 #include "net/base/transport_security_state.h" 53 #include "net/base/transport_security_state.h"
54 #include "ui/base/resource/resource_bundle.h" 54 #include "ui/base/resource/resource_bundle.h"
55 #include "webkit/database/database_tracker.h" 55 #include "webkit/database/database_tracker.h"
56 #include "webkit/quota/quota_manager.h" 56 #include "webkit/quota/quota_manager.h"
57 57
58 #if defined(TOOLKIT_USES_GTK) 58 #if defined(TOOLKIT_USES_GTK)
59 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 59 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
60 #endif 60 #endif
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 }; 816 };
817 #endif 817 #endif
818 818
819 Profile* Profile::CreateOffTheRecordProfile() { 819 Profile* Profile::CreateOffTheRecordProfile() {
820 #if defined(OS_CHROMEOS) 820 #if defined(OS_CHROMEOS)
821 if (Profile::IsGuestSession()) 821 if (Profile::IsGuestSession())
822 return new GuestSessionProfile(this); 822 return new GuestSessionProfile(this);
823 #endif 823 #endif
824 return new OffTheRecordProfileImpl(this); 824 return new OffTheRecordProfileImpl(this);
825 } 825 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698