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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 1986823002: Reset user data directory and disk cache directory after downgrade. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cr Created 4 years, 7 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 | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | chrome/browser/user_data_downgrade.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 8ea00c77069be45358207274c58e24df948f0198..62f7aee4acd6451eb8998269b57cb8f6d57dcfd0 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -60,6 +60,7 @@
#include <malloc.h>
#include <algorithm>
#include "base/debug/close_handle_hook_win.h"
+#include "chrome/browser/user_data_downgrade.h"
#include "chrome/common/child_process_logging.h"
#include "chrome/common/v8_breakpad_support_win.h"
#include "components/crash/content/app/crashpad.h"
@@ -719,8 +720,12 @@ void ChromeMainDelegate::PreSandboxStartup() {
#endif
// Initialize the user data dir for any process type that needs it.
- if (chrome::ProcessNeedsProfileDir(process_type))
+ if (chrome::ProcessNeedsProfileDir(process_type)) {
InitializeUserDataDir();
+#if defined(OS_WIN)
+ MoveUserDataForFirstRunAfterDowngrade();
+#endif
+ }
// Register component_updater PathProvider after DIR_USER_DATA overidden by
// command line flags. Maybe move the chrome PathProvider down here also?
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | chrome/browser/user_data_downgrade.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698