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/installer | |
| 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/installer')
| -rw-r--r-- | chrome/installer/util/master_preferences.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h index a05ae92..28175c5 100644 --- a/chrome/installer/util/master_preferences.h +++ b/chrome/installer/util/master_preferences.h @@ -24,9 +24,11 @@ class DictionaryValue; namespace installer { +#if !defined(OS_MACOSX) // This is the default name for the master preferences file used to pre-set // values in the user profile at first run. const char kDefaultMasterPrefs[] = "master_preferences"; +#endif // The master preferences is a JSON file with the same entries as the // 'Default\Preferences' file. This function parses the distribution |