Add two new master preferences.

chrome/installer/util/master_preferences.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/installer/util/master_preferences.h"
 
@@ skipping 21 matching lines @@
 namespace installer_util {
 // All the preferences below are expected to be inside the JSON "distribution"
 // block. See master_preferences.h for an example.
 
 // Boolean pref that triggers skipping the first run dialogs.
 const wchar_t kDistroSkipFirstRunPref[] = L"skip_first_run_ui";
 // Boolean pref that triggers loading the welcome page.
 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.
 // Create Desktop and QuickLaunch shortcuts.
 const wchar_t kCreateAllShortcuts[] = L"create_all_shortcuts";
 // Prevent installer from launching Chrome after a successful first install.
 const wchar_t kDoNotLaunchChrome[] = L"do_not_launch_chrome";
 // Register Chrome as default browser on the system.
 const wchar_t kMakeChromeDefault[] = L"make_chrome_default";
 // Install Chrome to system wise location.
@@ skipping 24 matching lines @@
   DictionaryValue* distro = NULL;
   if (json_root->GetDictionary(L"distribution", &distro)) {
     if (GetBooleanPref(distro, kDistroSkipFirstRunPref))
       parse_result |= MASTER_PROFILE_NO_FIRST_RUN_UI;
     if (GetBooleanPref(distro, kDistroShowWelcomePage))
       parse_result |= MASTER_PROFILE_SHOW_WELCOME;
     if (GetBooleanPref(distro, kDistroImportSearchPref))
       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))
       parse_result |= MASTER_PROFILE_DO_NOT_LAUNCH_CHROME;
     if (GetBooleanPref(distro, kMakeChromeDefault))
       parse_result |= MASTER_PROFILE_MAKE_CHROME_DEFAULT;
     if (GetBooleanPref(distro, kSystemLevel))
       parse_result |= MASTER_PROFILE_SYSTEM_LEVEL;
     if (GetBooleanPref(distro, kVerboseLogging))
       parse_result |= MASTER_PROFILE_VERBOSE_LOGGING;
     if (GetBooleanPref(distro, kRequireEula))
       parse_result |= MASTER_PROFILE_REQUIRE_EULA;
     if (GetBooleanPref(distro, kAltShortcutText))
       parse_result |= MASTER_PROFILE_ALT_SHORTCUT_TXT;
   }
   return parse_result;
 }
 
 }  // installer_util