summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-07 22:29:23 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-07 22:29:23 +0000
commit35b679f1b69b4e29a9c37f258fdefc712e032fcb (patch)
tree7d941f6e73196cf0fb7528b0f4ec0b7c4b4b23bb /chrome/browser/profile.cc
parentcfa428e0e42218b43f0c0b2486d2cc19b675d37d (diff)
downloadchromium_src-35b679f1b69b4e29a9c37f258fdefc712e032fcb.zip
chromium_src-35b679f1b69b4e29a9c37f258fdefc712e032fcb.tar.gz
chromium_src-35b679f1b69b4e29a9c37f258fdefc712e032fcb.tar.bz2
Move user script directory into profile.
Review URL: http://codereview.chromium.org/17242 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
-rw-r--r--chrome/browser/profile.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 9014424..6168275 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -450,12 +450,11 @@ ExtensionsService* ProfileImpl::GetExtensionsService() {
GreasemonkeyMaster* ProfileImpl::GetGreasemonkeyMaster() {
if (!greasemonkey_master_.get()) {
- std::wstring script_dir_str;
- PathService::Get(chrome::DIR_USER_SCRIPTS, &script_dir_str);
- FilePath script_dir(script_dir_str);
+ std::wstring script_dir = GetPath();
+ file_util::AppendToPath(&script_dir, chrome::kUserScriptsDirname);
greasemonkey_master_ =
new GreasemonkeyMaster(g_browser_process->file_thread()->message_loop(),
- script_dir);
+ FilePath(script_dir));
}
return greasemonkey_master_.get();