diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-30 20:55:12 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-30 20:55:12 +0000 |
| commit | 2b4e8a891718f8887740d90860497e64d02a8c17 (patch) | |
| tree | dfd92175c521908bec61aff60a03acbbcb0d28f3 /chrome/installer/util/master_preferences.cc | |
| parent | 3cff29f032eaf2c86567a0fa63a6f456813b046a (diff) | |
| download | chromium_src-2b4e8a891718f8887740d90860497e64d02a8c17.zip chromium_src-2b4e8a891718f8887740d90860497e64d02a8c17.tar.gz chromium_src-2b4e8a891718f8887740d90860497e64d02a8c17.tar.bz2 | |
Add two new master preferences (import_bookmarks and make_default_browser_for_user). make_default_browser_for_user will make Chrome default on the first run of Chrome instead of installer doing it. This will allow Chrome to import user profile data from current default browser, before making Chrome default.
BUG=9708,10912
Review URL: http://codereview.chromium.org/99165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/master_preferences.cc')
| -rw-r--r-- | chrome/installer/util/master_preferences.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc index 2e70120..22dbf08 100644 --- a/chrome/installer/util/master_preferences.cc +++ b/chrome/installer/util/master_preferences.cc @@ -39,8 +39,12 @@ const wchar_t kDistroSkipFirstRunPref[] = L"skip_first_run_ui"; const wchar_t kDistroShowWelcomePage[] = L"show_welcome_page"; // Boolean pref that triggers silent import of the default search engine. const wchar_t kDistroImportSearchPref[] = L"import_search_engine"; -// Boolean pref that triggers silent import of the browse history. +// Boolean pref that triggers silent import of the default browser history. const wchar_t kDistroImportHistoryPref[] = L"import_history"; +// Boolean pref that triggers silent import of the default browser bookmarks. +const wchar_t kDistroImportBookmarksPref[] = L"import_bookmarks"; +// Register Chrome as default browser for the current user. +const wchar_t kMakeChromeDefaultForUser[] = L"make_chrome_default_for_user"; // The following boolean prefs have the same semantics as the corresponding // setup command line switches. See chrome/installer/util/util_constants.cc // for more info. @@ -85,6 +89,10 @@ int ParseDistributionPreferences(const std::wstring& master_prefs_path) { parse_result |= MASTER_PROFILE_IMPORT_SEARCH_ENGINE; if (GetBooleanPref(distro, kDistroImportHistoryPref)) parse_result |= MASTER_PROFILE_IMPORT_HISTORY; + if (GetBooleanPref(distro, kDistroImportBookmarksPref)) + parse_result |= MASTER_PROFILE_IMPORT_BOOKMARKS; + if (GetBooleanPref(distro, kMakeChromeDefaultForUser)) + parse_result |= MASTER_PROFILE_MAKE_CHROME_DEFAULT_FOR_USER; if (GetBooleanPref(distro, kCreateAllShortcuts)) parse_result |= MASTER_PROFILE_CREATE_ALL_SHORTCUTS; if (GetBooleanPref(distro, kDoNotLaunchChrome)) |