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

Side by Side Diff: chrome/browser/profiles/profile_impl.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/profiles/profile.cc ('k') | chrome/browser/ssl/ssl_blocking_page.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_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "chrome/browser/prefs/pref_value_store.h" 54 #include "chrome/browser/prefs/pref_value_store.h"
55 #include "chrome/browser/prefs/scoped_user_pref_update.h" 55 #include "chrome/browser/prefs/scoped_user_pref_update.h"
56 #include "chrome/browser/prerender/prerender_manager.h" 56 #include "chrome/browser/prerender/prerender_manager.h"
57 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 57 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
58 #include "chrome/browser/profiles/profile_dependency_manager.h" 58 #include "chrome/browser/profiles/profile_dependency_manager.h"
59 #include "chrome/browser/profiles/profile_manager.h" 59 #include "chrome/browser/profiles/profile_manager.h"
60 #include "chrome/browser/search_engines/template_url_fetcher.h" 60 #include "chrome/browser/search_engines/template_url_fetcher.h"
61 #include "chrome/browser/search_engines/template_url_model.h" 61 #include "chrome/browser/search_engines/template_url_model.h"
62 #include "chrome/browser/sessions/session_service_factory.h" 62 #include "chrome/browser/sessions/session_service_factory.h"
63 #include "chrome/browser/spellcheck_host.h" 63 #include "chrome/browser/spellcheck_host.h"
64 #include "chrome/browser/ssl/ssl_host_state.h"
65 #include "chrome/browser/sync/profile_sync_factory_impl.h" 64 #include "chrome/browser/sync/profile_sync_factory_impl.h"
66 #include "chrome/browser/sync/profile_sync_service.h" 65 #include "chrome/browser/sync/profile_sync_service.h"
67 #include "chrome/browser/tabs/pinned_tab_service_factory.h" 66 #include "chrome/browser/tabs/pinned_tab_service_factory.h"
68 #include "chrome/browser/transport_security_persister.h" 67 #include "chrome/browser/transport_security_persister.h"
69 #include "chrome/browser/ui/browser_list.h" 68 #include "chrome/browser/ui/browser_list.h"
70 #include "chrome/browser/ui/find_bar/find_bar_state.h" 69 #include "chrome/browser/ui/find_bar/find_bar_state.h"
71 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 70 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
72 #include "chrome/browser/ui/webui/extension_icon_source.h" 71 #include "chrome/browser/ui/webui/extension_icon_source.h"
73 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h" 72 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
74 #include "chrome/browser/user_style_sheet_watcher.h" 73 #include "chrome/browser/user_style_sheet_watcher.h"
(...skipping 10 matching lines...) Expand all
85 #include "chrome/common/render_messages.h" 84 #include "chrome/common/render_messages.h"
86 #include "chrome/common/spellcheck_messages.h" 85 #include "chrome/common/spellcheck_messages.h"
87 #include "content/browser/appcache/chrome_appcache_service.h" 86 #include "content/browser/appcache/chrome_appcache_service.h"
88 #include "content/browser/browser_thread.h" 87 #include "content/browser/browser_thread.h"
89 #include "content/browser/chrome_blob_storage_context.h" 88 #include "content/browser/chrome_blob_storage_context.h"
90 #include "content/browser/file_system/browser_file_system_helper.h" 89 #include "content/browser/file_system/browser_file_system_helper.h"
91 #include "content/browser/geolocation/geolocation_permission_context.h" 90 #include "content/browser/geolocation/geolocation_permission_context.h"
92 #include "content/browser/host_zoom_map.h" 91 #include "content/browser/host_zoom_map.h"
93 #include "content/browser/in_process_webkit/webkit_context.h" 92 #include "content/browser/in_process_webkit/webkit_context.h"
94 #include "content/browser/renderer_host/render_process_host.h" 93 #include "content/browser/renderer_host/render_process_host.h"
94 #include "content/browser/ssl/ssl_host_state.h"
95 #include "content/browser/user_metrics.h" 95 #include "content/browser/user_metrics.h"
96 #include "content/common/notification_service.h" 96 #include "content/common/notification_service.h"
97 #include "grit/browser_resources.h" 97 #include "grit/browser_resources.h"
98 #include "grit/locale_settings.h" 98 #include "grit/locale_settings.h"
99 #include "net/base/transport_security_state.h" 99 #include "net/base/transport_security_state.h"
100 #include "ui/base/resource/resource_bundle.h" 100 #include "ui/base/resource/resource_bundle.h"
101 #include "webkit/database/database_tracker.h" 101 #include "webkit/database/database_tracker.h"
102 #include "webkit/quota/quota_manager.h" 102 #include "webkit/quota/quota_manager.h"
103 103
104 #if defined(OS_WIN) 104 #if defined(OS_WIN)
(...skipping 1542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1647 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1647 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1648 return NULL; 1648 return NULL;
1649 if (!prerender_manager_.get()) { 1649 if (!prerender_manager_.get()) {
1650 CHECK(g_browser_process->prerender_tracker()); 1650 CHECK(g_browser_process->prerender_tracker());
1651 prerender_manager_.reset( 1651 prerender_manager_.reset(
1652 new prerender::PrerenderManager( 1652 new prerender::PrerenderManager(
1653 this, g_browser_process->prerender_tracker())); 1653 this, g_browser_process->prerender_tracker()));
1654 } 1654 }
1655 return prerender_manager_.get(); 1655 return prerender_manager_.get();
1656 } 1656 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698