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

Side by Side Diff: chrome/browser/profile_impl.cc

Issue 3243005: Revert 57715 - Add a helper class that keeps per-profile information for File... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 3 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/profile_impl.h ('k') | chrome/browser/renderer_host/resource_message_filter.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/profile_impl.h" 5 #include "chrome/browser/profile_impl.h"
6 6
7 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/chrome_thread.h" 25 #include "chrome/browser/chrome_thread.h"
26 #include "chrome/browser/dom_ui/ntp_resource_cache.h" 26 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
27 #include "chrome/browser/download/download_manager.h" 27 #include "chrome/browser/download/download_manager.h"
28 #include "chrome/browser/extensions/extension_devtools_manager.h" 28 #include "chrome/browser/extensions/extension_devtools_manager.h"
29 #include "chrome/browser/extensions/extension_error_reporter.h" 29 #include "chrome/browser/extensions/extension_error_reporter.h"
30 #include "chrome/browser/extensions/extension_message_service.h" 30 #include "chrome/browser/extensions/extension_message_service.h"
31 #include "chrome/browser/extensions/extension_process_manager.h" 31 #include "chrome/browser/extensions/extension_process_manager.h"
32 #include "chrome/browser/extensions/extensions_service.h" 32 #include "chrome/browser/extensions/extensions_service.h"
33 #include "chrome/browser/extensions/user_script_master.h" 33 #include "chrome/browser/extensions/user_script_master.h"
34 #include "chrome/browser/favicon_service.h" 34 #include "chrome/browser/favicon_service.h"
35 #include "chrome/browser/file_system/file_system_host_context.h"
36 #include "chrome/browser/find_bar_state.h" 35 #include "chrome/browser/find_bar_state.h"
37 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 36 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
38 #include "chrome/browser/geolocation/geolocation_permission_context.h" 37 #include "chrome/browser/geolocation/geolocation_permission_context.h"
39 #include "chrome/browser/history/history.h" 38 #include "chrome/browser/history/history.h"
40 #include "chrome/browser/history/top_sites.h" 39 #include "chrome/browser/history/top_sites.h"
41 #include "chrome/browser/host_content_settings_map.h" 40 #include "chrome/browser/host_content_settings_map.h"
42 #include "chrome/browser/host_zoom_map.h" 41 #include "chrome/browser/host_zoom_map.h"
43 #include "chrome/browser/in_process_webkit/webkit_context.h" 42 #include "chrome/browser/in_process_webkit/webkit_context.h"
44 #include "chrome/browser/net/chrome_url_request_context.h" 43 #include "chrome/browser/net/chrome_url_request_context.h"
45 #include "chrome/browser/net/gaia/token_service.h" 44 #include "chrome/browser/net/gaia/token_service.h"
(...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 } 972 }
974 973
975 PersonalDataManager* ProfileImpl::GetPersonalDataManager() { 974 PersonalDataManager* ProfileImpl::GetPersonalDataManager() {
976 if (!personal_data_manager_.get()) { 975 if (!personal_data_manager_.get()) {
977 personal_data_manager_ = new PersonalDataManager(); 976 personal_data_manager_ = new PersonalDataManager();
978 personal_data_manager_->Init(this); 977 personal_data_manager_->Init(this);
979 } 978 }
980 return personal_data_manager_.get(); 979 return personal_data_manager_.get();
981 } 980 }
982 981
983 FileSystemHostContext* ProfileImpl::GetFileSystemHostContext() {
984 if (!file_system_host_context_.get())
985 file_system_host_context_ = new FileSystemHostContext(
986 GetPath(), IsOffTheRecord());
987 DCHECK(file_system_host_context_.get());
988 return file_system_host_context_.get();
989 }
990
991 void ProfileImpl::InitThemes() { 982 void ProfileImpl::InitThemes() {
992 if (!created_theme_provider_) { 983 if (!created_theme_provider_) {
993 #if defined(TOOLKIT_USES_GTK) 984 #if defined(TOOLKIT_USES_GTK)
994 theme_provider_.reset(new GtkThemeProvider); 985 theme_provider_.reset(new GtkThemeProvider);
995 #else 986 #else
996 theme_provider_.reset(new BrowserThemeProvider); 987 theme_provider_.reset(new BrowserThemeProvider);
997 #endif 988 #endif
998 theme_provider_->Init(this); 989 theme_provider_->Init(this);
999 created_theme_provider_ = true; 990 created_theme_provider_ = true;
1000 } 991 }
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 #if defined(OS_CHROMEOS) 1235 #if defined(OS_CHROMEOS)
1245 chromeos::ProxyConfigServiceImpl* 1236 chromeos::ProxyConfigServiceImpl*
1246 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { 1237 ProfileImpl::GetChromeOSProxyConfigServiceImpl() {
1247 if (!chromeos_proxy_config_service_impl_) { 1238 if (!chromeos_proxy_config_service_impl_) {
1248 chromeos_proxy_config_service_impl_ = 1239 chromeos_proxy_config_service_impl_ =
1249 new chromeos::ProxyConfigServiceImpl(); 1240 new chromeos::ProxyConfigServiceImpl();
1250 } 1241 }
1251 return chromeos_proxy_config_service_impl_; 1242 return chromeos_proxy_config_service_impl_;
1252 } 1243 }
1253 #endif // defined(OS_CHROMEOS) 1244 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/profile_impl.h ('k') | chrome/browser/renderer_host/resource_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698