Merge r18210....

chrome/installer/util/master_preferences.h

 // 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.
 //
 // This file contains functions processing master preference file used by
 // setup and first run.
 
 #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H__
 #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H__
 
@@ skipping 35 matching lines @@
   MASTER_PROFILE_DO_NOT_LAUNCH_CHROME          = 0x1 << 9,
   // Register Chrome as default browser on the system.
   MASTER_PROFILE_MAKE_CHROME_DEFAULT           = 0x1 << 10,
   // Install Chrome to system wise location.
   MASTER_PROFILE_SYSTEM_LEVEL                  = 0x1 << 11,
   // Run installer in verbose mode.
   MASTER_PROFILE_VERBOSE_LOGGING               = 0x1 << 12,
   // Show the EULA and do not install if not accepted.
   MASTER_PROFILE_REQUIRE_EULA                  = 0x1 << 13,
   // Use an alternate description text for some shortcuts.
-  MASTER_PROFILE_ALT_SHORTCUT_TXT              = 0x1 << 14
+  MASTER_PROFILE_ALT_SHORTCUT_TXT              = 0x1 << 14,
+  // Use a smaller OEM info bubble on first run.
+  MASTER_PROFILE_OEM_FIRST_RUN_BUBBLE          = 0x1 << 15,
+  // Import home page from the default browser.
+  MASTER_PROFILE_IMPORT_HOME_PAGE              = 0x1 << 16
 };
 
 // The master preferences is a JSON file with the same entries as the
 // 'Default\Preferences' file. This function parses the distribution
 // section of the preferences file.
 //
 // A prototypical 'master_preferences' file looks like this:
 //
 // {
 //   "distribution": {
 //      "skip_first_run_ui": true,
 //      "show_welcome_page": true,
 //      "import_search_engine": true,
 //      "import_history": false,
 //      "import_bookmarks": false,
+//      "import_home_page": false,
 //      "create_all_shortcuts": true,
 //      "do_not_launch_chrome": false,
 //      "make_chrome_default": false,
 //      "make_chrome_default_for_user": true,
 //      "system_level": false,
 //      "verbose_logging": true,
 //      "require_eula": true,
 //      "alternate_shortcut_text": false
 //   },
 //   "browser": {
@@ skipping 29 matching lines @@
 // Note that the entries are usually urls but they don't have to.
 //
 // This function retuns the list as a vector of strings. If the master
 // preferences file does not contain such list the vector is empty.
 std::vector<std::wstring> ParseFirstRunTabs(
     const std::wstring& master_prefs_path);
 
 }
 
 #endif  // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H__