summaryrefslogtreecommitdiffstats
path: root/chrome_frame/resources
Commit message (Collapse)AuthorAgeFilesLines
* WinDDK ATL and MSVC express 2008/2005 compatability mark@chromium.org2011-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gives 'out of the box' compatability with VC2008 express - i.e. no modifications needed to system headers or .gyp* files or related hacks. Just set the GYP_MSVS_VERSION to 200Xe (e for express, same as the linked blog on the issue and first google hit as well). 1) Changes to build\common.gypi to turn off to define COMPILER_MSVC_EXPRESS if a express is detected (through the GYP_MSVC_VERSION environment variable), turn off the _SECURE_ATL define (which is flagged as an error with WinDDK's ATL, _SECURE_ATL adds [more] CRT checks to other ATL versions) and hard to link to the atl stdthunk library with express editions. Also, explicitly link to the base WinSDK libraries in common.gypi and mini_installer.gypi for MSVC 2005 express. 2) Fixes a few .cc files that have the wrong include order with the ATL headers when using the Windows DDK ATL. The Windows DDK ATL brings in intsafe.h (WinSDK, not WinDDK) with atlwin.h and generates multiple INTXX_MIN/MAX def warnings which get flagged as errors with the warnings as errors flag if not included before other libraries that have the same definitions like ICU. 3) Changes to .rc files to avoid pulling in afxres.h (an MFC header - it's available in the WinDDK) and winres.h which VCExpress doesn't have (it's available in a WinSDK sample, but that kind of the purpose of it). The main Chromium .rc files are already structured this way, I just changed the rest and changed the output of grit to do the same. 4) Removes the memset obj file linking in mini_installer.gyp and simply implements memset for mini_installer.cc. Only changes to the chromium branch now. There are some .rc files in the Python26, Native Client, and Angle in samples that could #3 changes. They are not required for Chromium, however. ------ VC2005SP1 can be downloaded at http://www.microsoft.com/downloads/en/details.aspx?FamilyId=7B0B0339-613A-46E6-AB4D-080D4D4A8C4E&displaylang=en (or non-SP1 at http://download.microsoft.com/download/8/3/a/83aad8f9-38ba-4503-b3cd-ba28c360c27b/ENU/vcsetup.exe) VC2008SP1 can be downloaded at http://www.microsoft.com/downloads/en/details.aspx?FamilyId=F3FBB04E-92C2-4701-B4BA-92E26E408569&displaylang=en currently. The base developer instructions work fine afterwards with a couple tweaks for express versions: http://www.chromium.org/developers/how-tos/build-instructions-windows Under "Additional (free) downloads" under step 2: X) Only the first 3 Non-SP KB Patches are needed for express. Don't forget to forget GYP_MSVS_VERSION environment as appropriate - 2008e for Visual C++ 2008 Express, for example. Under "Additional (free) downloads" after step 5 [These only apply to 2008 express, 2005 works fine out of the box]: 6A) Download the WinDDK for the atl headers and libs - http://msdn.microsoft.com/en-us/windows/hardware/gg487463.aspx. It works fine, but you do not need to install the whole DDK. In the WDK directory just install headers.msi, libs_x86fre.msi, and libs_x64fre.msi; just grab the atl headers and atl*.lib libs; right click the installers and uninstall afterwards. Add the appropriate include and lib paths to your global settings. 6B) To build x64 targets (x64 Native Client) download: http://www.cppblog.com/Files/xcpp/VCE64BIT_WIN7SDK.zip Follow the readme instructions. Further information behind that and x64 target building with express: - http://jenshuebel.wordpress.com/2009/02/12/visual-c-2008-express-edition-and-64-bit-targets/ - http://www.cppblog.com/xcpp/archive/2009/09/09/vc2008express_64bit_win7sdk.html ---------------- BUG=1433, 5026, 72885 TEST=Compiles in both Debug and Release mode in Visual C++ Express 2008/2005 and does not effect other build setups. In addition, the WinDDK ATL compiles with the secure_atl=0 in the GYP_DEFINES environment variable on non-express versions of MSVC. Review URL: http://codereview.chromium.org/6676030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78921 0039d316-1c4b-4281-b951-d872f2087c98
* Further modifications to the Ready Mode UI in response to feedback. Height, ↵erikwright@chromium.org2011-03-161-0/+8
| | | | | | | | | | icon dimensions, text positioning are same as IE infobars. Buttons now implement user selected theme. BUG=None TEST=None Review URL: http://codereview.chromium.org/6321025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78311 0039d316-1c4b-4281-b951-d872f2087c98
* Move elevation registration into a separate rgs script and leave removal of ↵tommi@chromium.org2011-02-031-0/+1
| | | | | | | | | | | it up to the installer. TEST=Manual registration of npchrome_frame continues to register the elevation policy, but unregistration of the DLL will not remove the elevation policy (since the installer now does that). BUG=none Review URL: http://codereview.chromium.org/6286083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73645 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the tangled ball of poo that was our resource scripts. We previously had ↵robertshield@chromium.org2010-10-211-34/+4
| | | | | | | | | | | two version info resources, one of which got updated correctly during incremental builds, the other of which was used. Bring this down to the conventional one and make sure it gets updated. BUG=Version information didn't get updated through incremental builds. TEST=Now it does. Review URL: http://codereview.chromium.org/3974001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63355 0039d316-1c4b-4281-b951-d872f2087c98
* First step for cleaning registration code for ChromeFrame.stoyan@chromium.org2010-07-201-0/+1
| | | | | | | | Create separate RGS file for registering CLSID as a BHO. Remove the code that manually did the BHO registration. BUG=48987 Review URL: http://codereview.chromium.org/3029007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53040 0039d316-1c4b-4281-b951-d872f2087c98
* Assign resource ids from a central file.tony@chromium.org2010-07-131-1/+1
| | | | | | | | | | | This allows us to control resource id assignment across all grd files so we can avoid id collisions. BUG=48625 Review URL: http://codereview.chromium.org/2961002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52211 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up .grds, step 1: Alphabetize.pkasting@chromium.org2010-07-081-5/+4
| | | | | | | BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51906 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 51572 - Clean up .grds, step 1: Alphabetize.pkasting@chromium.org2010-07-021-4/+5
| | | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2838041 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/2864039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51575 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up .grds, step 1: Alphabetize.pkasting@chromium.org2010-07-021-5/+4
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2838041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51572 0039d316-1c4b-4281-b951-d872f2087c98
* Simplify Chrome Frame usage of Chrome identifiers by simply using the Chrome ↵pkasting@chromium.org2010-05-282-7/+7
| | | | | | | | | | identifiers directly. This required renaming a few identifiers to avoid macro renaming conflicts when including the Chrome headers. BUG=none TEST=none Review URL: http://codereview.chromium.org/2359002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48543 0039d316-1c4b-4281-b951-d872f2087c98
* Completing Chrome Frame localization by adding the resource script ↵robertshield@chromium.org2010-03-242-27/+6
| | | | | | | | | | | containing the dialog template to Chrome's generated_resources.grd. Associated changes in CF to call _AtlBaseModule.SetResourceInstance to get it to load dialog templates from a resource dll. BUG=24305 TEST=The Find in page dialog in full tab Chrome Frame is localized. Review URL: http://codereview.chromium.org/1293002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42543 0039d316-1c4b-4281-b951-d872f2087c98
* Add a simple resource loader to Chrome Frame that is capable of finding, ↵robertshield@chromium.org2010-03-241-14/+1
| | | | | | | | | | | | | | | loading and extracting resources from the Chrome locale DLLs. Add the Chrome Frame resource strings to the Chrome .grds so they get built directly into the Chrome locale dlls. There is one remaining todo here, which is to load the dialog template into a grd + rc somewhere (probably in generated_resources.grd) and then get CF to load dialog templates from a different module. Will do that in another patch. BUG=24305 TEST=Chrome Frame when loaded on machines whose locales are not US English will display strings appropriate to those locales. Review URL: http://codereview.chromium.org/1240001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42423 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the unused chrome frame resources and merge things into a single .grd ↵robertshield@chromium.org2010-03-172-45/+3
| | | | | | | | | | | file in preparation for localizing Chrome Frame. BUG=24305 TEST=none Review URL: http://codereview.chromium.org/1055002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41835 0039d316-1c4b-4281-b951-d872f2087c98
* We need to support the following accelerators in the ChromeFrame Active ↵ananta@chromium.org2010-02-172-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | document, to ensure that the following accelerators navigate backwards and forwards in IE history. 1. VK_BACK and Alt + VK_LEFT to navigate back. 2. Shift + VK_BACK and Alt + VK_RIGHT to navigate forward. This CL adds support for this. We load the accelerator table in our Active document and when we receive an accelerator from Chrome, we first call the Windows API TranslateAccelerator to translate any accelerators and then continue with the default handling. Added handlers for navigating back and forward. Test=covered by unit test. Fixes bug http://code.google.com/p/chromium/issues/detail?id=35629 Bug=35629 Review URL: http://codereview.chromium.org/600117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39208 0039d316-1c4b-4281-b951-d872f2087c98
* Removing the active doc bmp.tommi@chromium.org2009-09-251-2/+0
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/222027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27198 0039d316-1c4b-4281-b951-d872f2087c98
* Initial import of the Chrome Frame codebase. Integration in chrome.gyp ↵slightlyoff@chromium.org2009-09-244-0/+187
coming in a separate CL. BUG=None TEST=None Review URL: http://codereview.chromium.org/218019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27042 0039d316-1c4b-4281-b951-d872f2087c98