summaryrefslogtreecommitdiffstats
path: root/chrome/common
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/common
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/common')
-rw-r--r--chrome/common/chrome_constants.cc1
-rw-r--r--chrome/common/chrome_constants.h1
-rw-r--r--chrome/common/chrome_paths.cc9
-rw-r--r--chrome/common/chrome_paths.h1
4 files changed, 2 insertions, 10 deletions
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index 0bd263e..17c8314 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -34,6 +34,7 @@ const wchar_t kPreferencesFilename[] = L"Preferences";
const wchar_t kSafeBrowsingFilename[] = L"Safe Browsing";
const wchar_t kThumbnailsFilename[] = L"Thumbnails";
const wchar_t kUserDataDirname[] = L"User Data";
+const wchar_t kUserScriptsDirname[] = L"User Scripts";
const wchar_t kWebDataFilename[] = L"Web Data";
const wchar_t kBookmarksFileName[] = L"Bookmarks";
const wchar_t kHistoryBookmarksFileName[] = L"Bookmarks From History";
diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h
index a838699..5e59578 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -31,6 +31,7 @@ extern const wchar_t kPreferencesFilename[];
extern const wchar_t kSafeBrowsingFilename[];
extern const wchar_t kThumbnailsFilename[];
extern const wchar_t kUserDataDirname[];
+extern const wchar_t kUserScriptsDirname[];
extern const wchar_t kWebDataFilename[];
extern const wchar_t kBookmarksFileName[];
extern const wchar_t kHistoryBookmarksFileName[];
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index edb0d58..7b2abc5 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -172,15 +172,6 @@ bool PathProvider(int key, FilePath* result) {
file_util::AppendToPath(&cur, L"Dictionaries");
create_dir = true;
break;
- case chrome::DIR_USER_SCRIPTS:
- // TODO(aa): Figure out where the script directory should live.
-#if defined(OS_WIN)
- cur = L"C:\\SCRIPTS\\";
-#else
- NOTIMPLEMENTED();
- return false;
-#endif
- break;
case chrome::FILE_LOCAL_STATE:
if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
return false;
diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h
index 17c1cd9..9300e99 100644
--- a/chrome/common/chrome_paths.h
+++ b/chrome/common/chrome_paths.h
@@ -25,7 +25,6 @@ enum {
DIR_APP_DICTIONARIES, // directory where the global dictionaries are
DIR_USER_DOCUMENTS, // directory for a user's "My Documents"
DIR_DEFAULT_DOWNLOADS, // directory for a user's "My Documents/Downloads"
- DIR_USER_SCRIPTS, // directory where Greasemonkey user scripts are stored
FILE_RESOURCE_MODULE, // full path and filename of the module that contains
// embedded resources (version, strings, images, etc.)
FILE_LOCAL_STATE, // path and filename to the file in which machine/