4 files changed, 7 insertions, 2 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 7f8c3b6..029a269 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -95,7 +95,7 @@ bool PathProvider(int key, std::wstring* result) {
         return false;
       file_util::AppendToPath(&cur, L"Crash Reports");
       break;
-    case chrome::DIR_DEFAULT_DOWNLOAD:
+    case chrome::DIR_USER_DESKTOP:
       if (FAILED(SHGetFolderPath(NULL, CSIDL_DESKTOPDIRECTORY, NULL,
                                  SHGFP_TYPE_CURRENT, system_buffer)))
         return false;
diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h
index 77913d4..02b14ae 100644
--- a/chrome/common/chrome_paths.h
+++ b/chrome/common/chrome_paths.h
@@ -17,7 +17,7 @@ enum {
   DIR_LOGS,              // directory where logs should be written
   DIR_USER_DATA,         // directory where user data can be written
   DIR_CRASH_DUMPS,       // directory where crash dumps are written
-  DIR_DEFAULT_DOWNLOAD,  // directory where downloads go by default
+  DIR_USER_DESKTOP,      // directory that correspond to the desktop
   DIR_RESOURCES,         // directory where application resources are stored
   DIR_INSPECTOR,         // directory where web inspector is located
   DIR_THEMES,            // directory where theme dll files are stored
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 0564bc7..b664b24 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -345,6 +345,10 @@ const wchar_t kMemoryCacheSize[] = L"renderer.memory_cache.size";
 // String which specifies where to download files to by default.
 const wchar_t kDownloadDefaultDirectory[] = L"download.default_directory";
 
+// Boolean that records if the download directory was changed by an
+// upgrade a unsafe location to a safe location.
+const wchar_t kDownloadDirUpgraded[] = L"download.directory_upgrade";
+
 // String which specifies where to save html files to by default.
 const wchar_t kSaveFileDefaultDirectory[] = L"savefile.default_directory";
 
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 4d991a1..a3c4736 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -112,6 +112,7 @@ extern const wchar_t kMemoryCacheSize[];
 
 extern const wchar_t kDownloadDefaultDirectory[];
 extern const wchar_t kDownloadExtensionsToOpen[];
+extern const wchar_t kDownloadDirUpgraded[];
 
 extern const wchar_t kSaveFileDefaultDirectory[];