diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-30 14:24:01 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-30 14:24:01 +0000 |
| commit | c9c1512e70096a0ce81ac7ebbbcafa2ce8e07205 (patch) | |
| tree | 4d22f86a5ca128f27a1b856eb1f9e56775517c05 /chrome/browser/first_run/first_run.cc | |
| parent | ef7aab90b0ac2ed31fab60c4a280355682015869 (diff) | |
| download | chromium_src-c9c1512e70096a0ce81ac7ebbbcafa2ce8e07205.zip chromium_src-c9c1512e70096a0ce81ac7ebbbcafa2ce8e07205.tar.gz chromium_src-c9c1512e70096a0ce81ac7ebbbcafa2ce8e07205.tar.bz2 | |
Enable brand codes and master preferences on the Mac.
BUG=93421
TEST=alter brand codes and master prefs files; should be read
Review URL: http://codereview.chromium.org/7655056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run/first_run.cc')
| -rw-r--r-- | chrome/browser/first_run/first_run.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 42388fc..205f12a 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -150,11 +150,9 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, MasterPrefs* out_prefs) { DCHECK(!user_data_dir.empty()); - // The standard location of the master prefs is next to the chrome binary. - FilePath master_prefs; - if (!PathService::Get(base::DIR_EXE, &master_prefs)) + FilePath master_prefs = MasterPrefsPath(); + if (master_prefs.empty()) return true; - master_prefs = master_prefs.AppendASCII(installer::kDefaultMasterPrefs); installer::MasterPreferences prefs(master_prefs); if (!prefs.read_from_file()) return true; |