diff options
| author | cpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 23:25:08 +0000 |
|---|---|---|
| committer | cpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 23:25:08 +0000 |
| commit | 1d1a51bb6862ae5d0fe4147c5f5a78ff450607a2 (patch) | |
| tree | 37d05eef3e28c5d6b09097e95580fa627d611e7e /chrome/installer/setup/main.cc | |
| parent | 162dc56ca7a6e9092c4dbc2f1da5a2be2ce4a26c (diff) | |
| download | chromium_src-1d1a51bb6862ae5d0fe4147c5f5a78ff450607a2.zip chromium_src-1d1a51bb6862ae5d0fe4147c5f5a78ff450607a2.tar.gz chromium_src-1d1a51bb6862ae5d0fe4147c5f5a78ff450607a2.tar.bz2 | |
This CL fixes bugs with EULA
- The first run import will trigger the eula again : this requires changes in browser_main.cc
so the master prefs are not processed again by the importer process
- The launch of setup.exe to show the eula was using a path that only works on developer builds
this requires relocating a constant from setup_constants to util_constants
BUG=1468838
Review URL: http://codereview.chromium.org/19680
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/main.cc')
| -rwxr-xr-x | chrome/installer/setup/main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/setup/main.cc b/chrome/installer/setup/main.cc index 2177eb9..0519a15 100755 --- a/chrome/installer/setup/main.cc +++ b/chrome/installer/setup/main.cc @@ -46,7 +46,7 @@ int PatchArchiveFile(bool system_install, const std::wstring& archive_path, installer::GetChromeInstallPath(system_install); file_util::AppendToPath(&existing_archive, installed_version->GetString()); - file_util::AppendToPath(&existing_archive, installer::kInstallerDir); + file_util::AppendToPath(&existing_archive, installer_util::kInstallerDir); file_util::AppendToPath(&existing_archive, installer::kChromeArchive); std::wstring patch_archive(archive_path); |