Merge r18210....

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 51 matching lines @@
 // Register Chrome as default browser on the system.
 const wchar_t kMakeChromeDefault[] = L"make_chrome_default";
 // Install Chrome to system wise location.
 const wchar_t kSystemLevel[] = L"system_level";
 // Run installer in verbose mode.
 const wchar_t kVerboseLogging[] = L"verbose_logging";
 // Show EULA dialog and install only if accepted.
 const wchar_t kRequireEula[] = L"require_eula";
 // Use alternate shortcut text for the main shortcut.
 const wchar_t kAltShortcutText[] = L"alternate_shortcut_text";
-
+// Boolean pref that triggers silent import of the default browser homepage.
+const wchar_t kDistroImportHomePagePref[] = L"import_home_page";
 
 int ParseDistributionPreferences(const std::wstring& master_prefs_path) {
   if (!file_util::PathExists(master_prefs_path))
     return MASTER_PROFILE_NOT_FOUND;
   LOG(INFO) << "master profile found";
 
   scoped_ptr<DictionaryValue> json_root(GetPrefsFromFile(master_prefs_path));
   if (!json_root.get())
     return MASTER_PROFILE_ERROR;
 
   int parse_result = 0;
   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, kDistroImportHomePagePref))
+      parse_result |= MASTER_PROFILE_IMPORT_HOME_PAGE;
     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;
@@ skipping 22 matching lines @@
     if (!tabs_list->Get(i, &entry) || !entry->GetAsString(&tab_entry)) {
       NOTREACHED();
       break;
     }
     launch_tabs.push_back(tab_entry);
   }
   return launch_tabs;
 }
 
 }  // installer_util