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

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 2053143002: Supports multiple profiles when DiskCacheDir is overridden by command line switches or group policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix linux trybot failure Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index d573936d3f6c02e02a53477c22dcc20ae4e3f3bf..2fa534d70f210abd8dfddd14cd66f3a8f2b5b2f5 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -77,6 +77,7 @@
#include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/features.h"
@@ -1236,9 +1237,11 @@ void ProfileImpl::GetCacheParameters(bool is_media_context,
int* max_size) {
DCHECK(cache_path);
DCHECK(max_size);
+
base::FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
if (!path.empty())
- *cache_path = path;
+ *cache_path = path.Append(cache_path->BaseName());
+
*max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
prefs_->GetInteger(prefs::kDiskCacheSize);
}
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698