summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_main_delegate.cc
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-02 17:59:42 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-02 17:59:42 +0000
commitff9ed9f4171c049ae5c090e53b99bdd0de9e5d82 (patch)
treefcdf6e9071071c134032041e1a32d2f7bbf04c8d /chrome/app/chrome_main_delegate.cc
parent0f5f8ee8edaa4cc9fa53290942be92126a58ed1a (diff)
downloadchromium_src-ff9ed9f4171c049ae5c090e53b99bdd0de9e5d82.zip
chromium_src-ff9ed9f4171c049ae5c090e53b99bdd0de9e5d82.tar.gz
chromium_src-ff9ed9f4171c049ae5c090e53b99bdd0de9e5d82.tar.bz2
Enable Enterprise enrollment on desktop builds.
Note: this is a reland of https://codereview.chromium.org/258743005 This change implements some of the DBus stub methods so that enterprise enrollment works on desktop builds. That will make development of features that depend on enrollment faster for developers that use this workflow (e.g. for kiosk enterprise apps, public accounts, testing some device policies, etc). - Override some of the directories and files involved with the enrollment state - Simple stub implementation of the DBus calls involved - Write a persistent cache of the install attributes - Cleaned up the stub for user cloud policy and made them persistent too - Updated some tests This change doesn't affect production code. TBR=jochen@chromium.org BUG=240269, 367674 Review URL: https://codereview.chromium.org/264943011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main_delegate.cc')
-rw-r--r--chrome/app/chrome_main_delegate.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index f8f76ff..6e93a8f 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -350,7 +350,7 @@ void InitializeUserDataDir() {
const bool specified_directory_was_invalid = !user_data_dir.empty() &&
!PathService::OverrideAndCreateIfNeeded(chrome::DIR_USER_DATA,
- user_data_dir, true);
+ user_data_dir, false, true);
// Save inaccessible or invalid paths so the user may be prompted later.
if (specified_directory_was_invalid)
chrome::SetInvalidSpecifiedUserDataDir(user_data_dir);