diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 17:24:17 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 17:24:17 +0000 |
| commit | 663f339a1197711e5a9b0f0f382920e529f4fb3e (patch) | |
| tree | ab66a4b7e8d014f3711b133db23376ba3848fe93 /chrome/installer/mini_installer | |
| parent | 0e7d57fa87b02031db31444a22cba54b32405896 (diff) | |
| download | chromium_src-663f339a1197711e5a9b0f0f382920e529f4fb3e.zip chromium_src-663f339a1197711e5a9b0f0f382920e529f4fb3e.tar.gz chromium_src-663f339a1197711e5a9b0f0f382920e529f4fb3e.tar.bz2 | |
Include the Chrome Frame binary in Chrome installers. Note that it will only be registered (and thus used) if the installer is run with the --chrome-frame flag.
Remove a bunch of CF-specific code in the process.
BUG=46818
TEST=Can use the same mini_installer.exe to install either Chrome or Chrome Frame.
Review URL: http://codereview.chromium.org/2839009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mini_installer')
| -rw-r--r-- | chrome/installer/mini_installer/appid.h | 1 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome.release | 2 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome_appid.cc | 1 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome_frame.release | 51 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome_frame_appid.cc | 10 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.cc | 3 |
6 files changed, 7 insertions, 61 deletions
diff --git a/chrome/installer/mini_installer/appid.h b/chrome/installer/mini_installer/appid.h index db6fa93..6403f9b 100644 --- a/chrome/installer/mini_installer/appid.h +++ b/chrome/installer/mini_installer/appid.h @@ -9,6 +9,7 @@ namespace google_update { extern const wchar_t kAppGuid[]; extern const wchar_t kSxSAppGuid[]; +extern const wchar_t kChromeFrameAppGuid[]; } #endif // CHROME_INSTALLER_MINI_INSTALLER_APPID_H_ diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index 2877457..a58fc28 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -43,6 +43,8 @@ Resources\Inspector\Images\*.*: %(VersionDir)s\Resources\Inspector\Images Resources\gmail_app\*.*: %(VersionDir)s\Resources\gmail_app Resources\calendar_app\*.*: %(VersionDir)s\Resources\calendar_app Resources\docs_app\*.*: %(VersionDir)s\Resources\docs_app +servers\*.dll: %(VersionDir)s\ +servers\*.exe: %(VersionDir)s\ Extensions\*.*: %(VersionDir)s\Extensions\ av*.dll: %(VersionDir)s\ pdf.dll: %(VersionDir)s\ diff --git a/chrome/installer/mini_installer/chrome_appid.cc b/chrome/installer/mini_installer/chrome_appid.cc index 4f5fb5f..8b3c283 100644 --- a/chrome/installer/mini_installer/chrome_appid.cc +++ b/chrome/installer/mini_installer/chrome_appid.cc @@ -7,4 +7,5 @@ namespace google_update { const wchar_t kAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; const wchar_t kSxSAppGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}"; +const wchar_t kChromeFrameAppGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}"; } diff --git a/chrome/installer/mini_installer/chrome_frame.release b/chrome/installer/mini_installer/chrome_frame.release deleted file mode 100644 index cfddf3e..0000000 --- a/chrome/installer/mini_installer/chrome_frame.release +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -[GENERAL] -chrome.exe: %(ChromeDir)s\ -wow_helper.exe: %(ChromeDir)s\ -Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries -chrome.dll: %(VersionDir)s\ -nacl64.exe: %(VersionDir)s\ -nacl64.dll: %(VersionDir)s\ -icudt42.dll: %(VersionDir)s\ -gears.dll: %(VersionDir)s\ -resources.pak: %(VersionDir)s\ -locales\*.dll: %(VersionDir)s\Locales -Resources\Inspector\*.*: %(VersionDir)s\Resources\Inspector -Resources\Inspector\Images\*.*: %(VersionDir)s\Resources\Inspector\Images -servers\*.dll: %(VersionDir)s\ -servers\*.exe: %(VersionDir)s\ -Extensions\*.*: %(VersionDir)s\Extensions\ -av*.dll: %(VersionDir)s\ -pdf.dll: %(VersionDir)s\ - -[GOOGLE_CHROME] -gcswf32.dll: %(VersionDir)s\ -plugin.vch: %(VersionDir)s\ diff --git a/chrome/installer/mini_installer/chrome_frame_appid.cc b/chrome/installer/mini_installer/chrome_frame_appid.cc deleted file mode 100644 index 51a74ee..0000000 --- a/chrome/installer/mini_installer/chrome_frame_appid.cc +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 2010 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 "chrome/installer/mini_installer/appid.h" - -namespace google_update { -const wchar_t kAppGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}"; -const wchar_t kSxSAppGuid[] = L""; -} diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc index 5a969d0..621d0cd 100644 --- a/chrome/installer/mini_installer/mini_installer.cc +++ b/chrome/installer/mini_installer/mini_installer.cc @@ -153,11 +153,14 @@ void SetFullInstallerFlag(HKEY root_key) { const wchar_t* app_guid = google_update::kAppGuid; int args_num; + wchar_t* cmd_line = ::GetCommandLine(); wchar_t** args = ::CommandLineToArgvW(cmd_line, &args_num); for (int i = 1; i < args_num; ++i) { if (0 == ::lstrcmpi(args[i], L"--chrome-sxs")) app_guid = google_update::kSxSAppGuid; + else if (0 == ::lstrcmpi(args[i], L"--chrome-frame")) + app_guid = google_update::kChromeFrameAppGuid; } if (!SafeStrCopy(ap_registry_key, _countof(ap_registry_key), |