Merge 22284 - Refactoring of master preferences parsing before adding a new p...

chrome/browser/first_run.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_FIRST_RUN_H_
 #define CHROME_BROWSER_FIRST_RUN_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 50 matching lines @@
   // dialogs. The detailed settings in the preference file is reported via
   // preference_details.
   //
   // This function destroys any existing prefs file and it is meant to be
   // invoked only on first run.
   //
   // See chrome/installer/util/master_preferences.h for a description of
   // 'master_preferences' file.
   static bool ProcessMasterPreferences(const FilePath& user_data_dir,
                                        const FilePath& master_prefs_path,
-                                       int* preference_details,
-                                       std::vector<std::wstring>* new_tabs);
+                                       std::vector<std::wstring>* new_tabs,
+                                       int* ping_delay);
 
   // Sets the kShouldShowFirstRunBubble local state pref so that the browser
   // shows the bubble once the main message loop gets going. Returns false if
   // the pref could not be set.
   static bool SetShowFirstRunBubblePref();
 
   // Sets the kShouldUseOEMFirstRunBubble local state pref so that the
   // browser shows the OEM first run bubble once the main message loop
   // gets going. Returns false if the pref could not be set.
   static bool SetOEMFirstRunBubblePref();
@@ skipping 62 matching lines @@
 // Show the First Run UI to the user, allowing them to create shortcuts for
 // the app, import their bookmarks and other data from another browser into
 // |profile| and perhaps some other tasks.
 // |process_singleton| is used to lock the handling of CopyData messages
 // while the First Run UI is visible.
 // Returns true if the user clicked "Start", false if the user pressed "Cancel"
 // or closed the dialog.
 bool OpenFirstRunDialog(Profile* profile, ProcessSingleton* process_singleton);
 
 #endif  // CHROME_BROWSER_FIRST_RUN_H_