| Index: chrome/installer/util/browser_distribution.cc
|
| ===================================================================
|
| --- chrome/installer/util/browser_distribution.cc (revision 23178)
|
| +++ chrome/installer/util/browser_distribution.cc (working copy)
|
| @@ -88,7 +88,7 @@
|
|
|
| void BrowserDistribution::LaunchUserExperiment(
|
| installer_util::InstallStatus status, const installer::Version& version,
|
| - bool system_install, int options) {
|
| + bool system_install) {
|
| }
|
|
|
|
|
|
|
| Property changes on: chrome\installer\util\browser_distribution.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/chrome/installer/util/browser_distribution.cc:r69-2775
|
| Merged /trunk/src/chrome/installer/util/browser_distribution.cc:r22284
|
|
|
|
|