Index: chrome/browser/shell_integration_win.cc |
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc |
index 8184442e5e811d01eff6f6bdfbd6636e7ce91fa2..c30dc78c2901a7f84d319ae9eb6cd56a9fcebf94 100644 |
--- a/chrome/browser/shell_integration_win.cc |
+++ b/chrome/browser/shell_integration_win.cc |
@@ -23,6 +23,7 @@ |
#include "base/win/scoped_propvariant.h" |
#include "base/win/shortcut.h" |
#include "base/win/windows_version.h" |
+#include "chrome/browser/policy/policy_path_parser.h" |
#include "chrome/browser/web_applications/web_app.h" |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_paths_internal.h" |
@@ -96,6 +97,8 @@ string16 GetExpectedAppId(const CommandLine& command_line, |
user_data_dir = command_line.GetSwitchValuePath(switches::kUserDataDir); |
else |
chrome::GetDefaultUserDataDirectory(&user_data_dir); |
+ // Adjust with any policy that overrides any other way to set the path. |
+ policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); |
DCHECK(!user_data_dir.empty()); |
base::FilePath profile_subdir; |