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" |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
303 PathService::Get(base::DIR_USER_CACHE, &user_cache_path) && | 303 PathService::Get(base::DIR_USER_CACHE, &user_cache_path) && |
304 app_data_path.AppendRelativePath(path_, &user_cache_path)) { | 304 app_data_path.AppendRelativePath(path_, &user_cache_path)) { |
305 base_cache_path_ = user_cache_path; | 305 base_cache_path_ = user_cache_path; |
306 } | 306 } |
307 } | 307 } |
308 #elif defined(OS_POSIX) // Posix minus Mac. | 308 #elif defined(OS_POSIX) // Posix minus Mac. |
309 // See http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html | 309 // See http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html |
310 // for a spec on where cache files go. The net effect for most systems is we | 310 // for a spec on where cache files go. The net effect for most systems is we |
311 // use ~/.cache/chromium/ for Chromium and ~/.cache/google-chrome/ for | 311 // use ~/.cache/chromium/ for Chromium and ~/.cache/google-chrome/ for |
312 // official builds. | 312 // official builds. |
313 if (!PathService::IsOverridden(chrome::DIR_USER_DATA)) { | |
evanm
2010/11/12 20:54:58
FYI, this regressed having separate cache director
| |
314 #if defined(GOOGLE_CHROME_BUILD) | 313 #if defined(GOOGLE_CHROME_BUILD) |
315 const char kCacheDir[] = "google-chrome"; | 314 const char kCacheDir[] = "google-chrome"; |
316 #else | 315 #else |
317 const char kCacheDir[] = "chromium"; | 316 const char kCacheDir[] = "chromium"; |
318 #endif | 317 #endif |
319 PathService::Get(base::DIR_USER_CACHE, &base_cache_path_); | 318 PathService::Get(base::DIR_USER_CACHE, &base_cache_path_); |
320 base_cache_path_ = base_cache_path_.Append(kCacheDir); | 319 base_cache_path_ = base_cache_path_.Append(kCacheDir); |
321 if (!file_util::PathExists(base_cache_path_)) | 320 if (!file_util::PathExists(base_cache_path_)) |
322 file_util::CreateDirectory(base_cache_path_); | 321 file_util::CreateDirectory(base_cache_path_); |
323 } | |
324 #endif | 322 #endif |
325 if (base_cache_path_.empty()) | 323 if (base_cache_path_.empty()) |
326 base_cache_path_ = path_; | 324 base_cache_path_ = path_; |
327 | 325 |
328 // Listen for theme installation. | 326 // Listen for theme installation. |
329 registrar_.Add(this, NotificationType::THEME_INSTALLED, | 327 registrar_.Add(this, NotificationType::THEME_INSTALLED, |
330 NotificationService::AllSources()); | 328 NotificationService::AllSources()); |
331 | 329 |
332 // Listen for bookmark model load, to bootstrap the sync service. | 330 // Listen for bookmark model load, to bootstrap the sync service. |
333 registrar_.Add(this, NotificationType::BOOKMARK_MODEL_LOADED, | 331 registrar_.Add(this, NotificationType::BOOKMARK_MODEL_LOADED, |
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1282 #if defined(OS_CHROMEOS) | 1280 #if defined(OS_CHROMEOS) |
1283 chromeos::ProxyConfigServiceImpl* | 1281 chromeos::ProxyConfigServiceImpl* |
1284 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { | 1282 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { |
1285 if (!chromeos_proxy_config_service_impl_) { | 1283 if (!chromeos_proxy_config_service_impl_) { |
1286 chromeos_proxy_config_service_impl_ = | 1284 chromeos_proxy_config_service_impl_ = |
1287 new chromeos::ProxyConfigServiceImpl(); | 1285 new chromeos::ProxyConfigServiceImpl(); |
1288 } | 1286 } |
1289 return chromeos_proxy_config_service_impl_; | 1287 return chromeos_proxy_config_service_impl_; |
1290 } | 1288 } |
1291 #endif // defined(OS_CHROMEOS) | 1289 #endif // defined(OS_CHROMEOS) |
OLD | NEW |