OLD | NEW |
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" |
11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "base/path_service.h" | 13 #include "base/path_service.h" |
14 #include "base/scoped_ptr.h" | 14 #include "base/scoped_ptr.h" |
15 #include "base/string_number_conversions.h" | 15 #include "base/string_number_conversions.h" |
16 #include "base/string_util.h" | 16 #include "base/string_util.h" |
| 17 #include "chrome/browser/about_flags.h" |
17 #include "chrome/browser/appcache/chrome_appcache_service.h" | 18 #include "chrome/browser/appcache/chrome_appcache_service.h" |
18 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 19 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
19 #include "chrome/browser/autofill/personal_data_manager.h" | 20 #include "chrome/browser/autofill/personal_data_manager.h" |
20 #include "chrome/browser/background_contents_service.h" | 21 #include "chrome/browser/background_contents_service.h" |
21 #include "chrome/browser/background_mode_manager.h" | 22 #include "chrome/browser/background_mode_manager.h" |
22 #include "chrome/browser/bookmarks/bookmark_model.h" | 23 #include "chrome/browser/bookmarks/bookmark_model.h" |
23 #include "chrome/browser/browser_list.h" | 24 #include "chrome/browser/browser_list.h" |
24 #include "chrome/browser/browser_process.h" | 25 #include "chrome/browser/browser_process.h" |
25 #include "chrome/browser/browser_thread.h" | 26 #include "chrome/browser/browser_thread.h" |
26 #include "chrome/browser/chrome_blob_storage_context.h" | 27 #include "chrome/browser/chrome_blob_storage_context.h" |
(...skipping 10 matching lines...) Expand all Loading... |
37 #include "chrome/browser/favicon_service.h" | 38 #include "chrome/browser/favicon_service.h" |
38 #include "chrome/browser/file_system/file_system_host_context.h" | 39 #include "chrome/browser/file_system/file_system_host_context.h" |
39 #include "chrome/browser/find_bar_state.h" | 40 #include "chrome/browser/find_bar_state.h" |
40 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" | 41 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" |
41 #include "chrome/browser/geolocation/geolocation_permission_context.h" | 42 #include "chrome/browser/geolocation/geolocation_permission_context.h" |
42 #include "chrome/browser/history/history.h" | 43 #include "chrome/browser/history/history.h" |
43 #include "chrome/browser/history/top_sites.h" | 44 #include "chrome/browser/history/top_sites.h" |
44 #include "chrome/browser/host_content_settings_map.h" | 45 #include "chrome/browser/host_content_settings_map.h" |
45 #include "chrome/browser/host_zoom_map.h" | 46 #include "chrome/browser/host_zoom_map.h" |
46 #include "chrome/browser/in_process_webkit/webkit_context.h" | 47 #include "chrome/browser/in_process_webkit/webkit_context.h" |
47 #include "chrome/browser/labs.h" | |
48 #include "chrome/browser/net/chrome_url_request_context.h" | 48 #include "chrome/browser/net/chrome_url_request_context.h" |
49 #include "chrome/browser/net/gaia/token_service.h" | 49 #include "chrome/browser/net/gaia/token_service.h" |
50 #include "chrome/browser/net/net_pref_observer.h" | 50 #include "chrome/browser/net/net_pref_observer.h" |
51 #include "chrome/browser/net/ssl_config_service_manager.h" | 51 #include "chrome/browser/net/ssl_config_service_manager.h" |
52 #include "chrome/browser/notifications/desktop_notification_service.h" | 52 #include "chrome/browser/notifications/desktop_notification_service.h" |
53 #include "chrome/browser/password_manager/password_store_default.h" | 53 #include "chrome/browser/password_manager/password_store_default.h" |
54 #include "chrome/browser/prefs/browser_prefs.h" | 54 #include "chrome/browser/prefs/browser_prefs.h" |
55 #include "chrome/browser/prefs/pref_value_store.h" | 55 #include "chrome/browser/prefs/pref_value_store.h" |
56 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 56 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
57 #include "chrome/browser/profile_manager.h" | 57 #include "chrome/browser/profile_manager.h" |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this, | 260 TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this, |
261 &ProfileImpl::EnsureSessionServiceCreated); | 261 &ProfileImpl::EnsureSessionServiceCreated); |
262 | 262 |
263 PrefService* prefs = GetPrefs(); | 263 PrefService* prefs = GetPrefs(); |
264 pref_change_registrar_.Init(prefs); | 264 pref_change_registrar_.Init(prefs); |
265 pref_change_registrar_.Add(prefs::kSpellCheckDictionary, this); | 265 pref_change_registrar_.Add(prefs::kSpellCheckDictionary, this); |
266 pref_change_registrar_.Add(prefs::kEnableSpellCheck, this); | 266 pref_change_registrar_.Add(prefs::kEnableSpellCheck, this); |
267 pref_change_registrar_.Add(prefs::kEnableAutoSpellCorrect, this); | 267 pref_change_registrar_.Add(prefs::kEnableAutoSpellCorrect, this); |
268 | 268 |
269 // Convert active labs into switches. Modifies the current command line. | 269 // Convert active labs into switches. Modifies the current command line. |
270 about_labs::ConvertLabsToSwitches(prefs, CommandLine::ForCurrentProcess()); | 270 about_flags::ConvertFlagsToSwitches(prefs, CommandLine::ForCurrentProcess()); |
271 | 271 |
272 #if defined(OS_MACOSX) | 272 #if defined(OS_MACOSX) |
273 // If the profile directory doesn't already have a cache directory and it | 273 // If the profile directory doesn't already have a cache directory and it |
274 // is under ~/Library/Application Support, use a suitable cache directory | 274 // is under ~/Library/Application Support, use a suitable cache directory |
275 // under ~/Library/Caches. For example, a profile directory of | 275 // under ~/Library/Caches. For example, a profile directory of |
276 // ~/Library/Application Support/Google/Chrome/MyProfileName that doesn't | 276 // ~/Library/Application Support/Google/Chrome/MyProfileName that doesn't |
277 // have a "Cache" or "MediaCache" subdirectory would use the cache directory | 277 // have a "Cache" or "MediaCache" subdirectory would use the cache directory |
278 // ~/Library/Caches/Google/Chrome/MyProfileName. | 278 // ~/Library/Caches/Google/Chrome/MyProfileName. |
279 // | 279 // |
280 // TODO(akalin): Come up with unit tests for this. | 280 // TODO(akalin): Come up with unit tests for this. |
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1280 #if defined(OS_CHROMEOS) | 1280 #if defined(OS_CHROMEOS) |
1281 chromeos::ProxyConfigServiceImpl* | 1281 chromeos::ProxyConfigServiceImpl* |
1282 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { | 1282 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { |
1283 if (!chromeos_proxy_config_service_impl_) { | 1283 if (!chromeos_proxy_config_service_impl_) { |
1284 chromeos_proxy_config_service_impl_ = | 1284 chromeos_proxy_config_service_impl_ = |
1285 new chromeos::ProxyConfigServiceImpl(); | 1285 new chromeos::ProxyConfigServiceImpl(); |
1286 } | 1286 } |
1287 return chromeos_proxy_config_service_impl_; | 1287 return chromeos_proxy_config_service_impl_; |
1288 } | 1288 } |
1289 #endif // defined(OS_CHROMEOS) | 1289 #endif // defined(OS_CHROMEOS) |
OLD | NEW |