diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 22:19:15 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 22:19:15 +0000 |
| commit | 0b9db6796ae57fe8bb36b2e89528efa51f8e938b (patch) | |
| tree | 6129eef9c5ab3698b7f1b86a7dd728f645a34d63 | |
| parent | 58cee002f1006ba3d9baa3b64fcf37be340a700c (diff) | |
| download | chromium_src-0b9db6796ae57fe8bb36b2e89528efa51f8e938b.zip chromium_src-0b9db6796ae57fe8bb36b2e89528efa51f8e938b.tar.gz chromium_src-0b9db6796ae57fe8bb36b2e89528efa51f8e938b.tar.bz2 | |
Add markers to app_host.exe and setup.exe to allow them to expose app commands via Google Update.
In http://codereview.chromium.org/10665002/ :
setup.exe is used by the 'quick-enable-application-host' app command.
app_host.exe is used by the 'install-application' app command.
Pending Omaha changes will require executables referenced by app commands to include a resource marker. This CL adds that marker to the appropriate exes.
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10795026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147552 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/app_host.rc | 36 | ||||
| -rw-r--r-- | chrome/chrome_browser_extensions.gypi | 1 | ||||
| -rw-r--r-- | chrome/installer/setup/setup.rc | 10 |
3 files changed, 47 insertions, 0 deletions
diff --git a/chrome/browser/extensions/app_host.rc b/chrome/browser/extensions/app_host.rc new file mode 100644 index 0000000..ffd5341 --- /dev/null +++ b/chrome/browser/extensions/app_host.rc @@ -0,0 +1,36 @@ +// Microsoft Visual C++ generated resource script. +// + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// GOOGLEUPDATEAPPLICATIONCOMMANDS is a "well-known" marker resource defined +// by Omaha. Executables must both be signed by Google and contain the marker +// in order to expose application commands. +// +#define IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP 1 + +IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP GOOGLEUPDATEAPPLICATIONCOMMANDS { 1L } + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index 52fc510..c18ec87 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -744,6 +744,7 @@ '<(DEPTH)/chrome/chrome.gyp:launcher_support', ], 'sources': [ + 'browser/extensions/app_host.rc', 'browser/extensions/app_host_stub_main.cc', ], }, diff --git a/chrome/installer/setup/setup.rc b/chrome/installer/setup/setup.rc index c6d4b95..0dae83b 100644 --- a/chrome/installer/setup/setup.rc +++ b/chrome/installer/setup/setup.rc @@ -134,5 +134,15 @@ IDR_OEMPG_ZH_TW.HTML HTML "eula\\oem_zh-TW.html" #include "setup_exe_version.rc" ///////////////////////////////////////////////////////////////////////////// +// +// GOOGLEUPDATEAPPLICATIONCOMMANDS is a "well-known" marker resource defined +// by Omaha. Executables must both be signed by Google and contain the marker +// in order to expose application commands. +// +#define IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP 1 + +IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP GOOGLEUPDATEAPPLICATIONCOMMANDS { 1L } + +///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED |