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

chrome/installer/util/google_chrome_distribution.h

Index: chrome/installer/util/google_chrome_distribution.h
===================================================================
--- chrome/installer/util/google_chrome_distribution.h	(revision 23178)
+++ chrome/installer/util/google_chrome_distribution.h	(working copy)
@@ -80,7 +80,7 @@
 
   virtual void LaunchUserExperiment(installer_util::InstallStatus status,
                                     const installer::Version& version,
-                                    bool system_install, int options);
+                                    bool system_install);
 
   // Assuming that the user qualifies, this function performs the inactive user
   // toast experiment. It will use chrome to show the UI and it will record the
Property changes on: chrome\installer\util\google_chrome_distribution.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/installer/util/google_chrome_distribution.h:r69-2775
   Merged /trunk/src/chrome/installer/util/google_chrome_distribution.h:r22284