summaryrefslogtreecommitdiffstats
path: root/tools/grit
Commit message (Collapse)AuthorAgeFilesLines
* grit_info: Explicitly make __file__ relative to the current directory.thakis@chromium.org2011-05-251-1/+84
| | | | | | | | | | | | | | | | __file__ is relative if grit_info is called like `python ../tools/grit/grit_info.py`, but not if it's invoked from python code like `import grit_info; grit_info.DoMain()`. And that confuses the xcode project generator, which will complain about hash collisions if these paths are serialized in absolute form. BUG=82230 TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=86551 Review URL: http://codereview.chromium.org/7066030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86647 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 86551 (turns out testers run `gclient sync` as well, and there are ↵thakis@chromium.org2011-05-251-1/+1
| | | | | | | | | | | | | | | | | | | 10.5 testers) (turns out testers run `gclient sync` as well, and there are 10.5 testers) (turns out testers run `gclient sync` as well, and there are 10.5 testers) (turns out testers run `gclient sync` as well, and there are 10.5 testers) (turns out testers run `gclient sync` as well, and there are 10.5 testers) (turns out testers run `gclient sync` as well, and there are 10.5 testers) (turns out testers run `gclient sync` as well, and there are 10.5 testers) (turns out testers run `gclient sync` as well, and there are 10.5 testers) (turns out testers run `gclient sync` as well, and there are 10.5 testers) - grit_info: Explicitly make __file__ relative to the current directory. __file__ is relative if grit_info is called like `python ../tools/grit/grit_info.py`, but not if it's invoked from python code like `import grit_info; grit_info.DoMain()`. And that confuses the xcode project generator, which will complain about hash collisions if these paths are serialized in absolute form. BUG=none TEST=none Review URL: http://codereview.chromium.org/7066030 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/6992052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86557 0039d316-1c4b-4281-b951-d872f2087c98
* grit_info: Explicitly make __file__ relative to the current directory.thakis@chromium.org2011-05-251-1/+1
| | | | | | | | | | | | | | __file__ is relative if grit_info is called like `python ../tools/grit/grit_info.py`, but not if it's invoked from python code like `import grit_info; grit_info.DoMain()`. And that confuses the xcode project generator, which will complain about hash collisions if these paths are serialized in absolute form. BUG=none TEST=none Review URL: http://codereview.chromium.org/7066030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86551 0039d316-1c4b-4281-b951-d872f2087c98
* Start generating translated policy templatesgfeher@chromium.org2011-05-242-1/+5
| | | | | | | | | | | | | | -Add output nodes of translations into policy_templates.grd. -Copy translated string tables into the Mac bundle. -Work around the problem that the zip tool would get too long command-line arguments if all the translated templates were enumerated as arguments. -Fix importing of UTF-8 strings into the template generator BUG=61779 TEST=Check that there are translated adml, adm and html files in policy_templates.zip. Review URL: http://codereview.chromium.org/6969064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86476 0039d316-1c4b-4281-b951-d872f2087c98
* Added resources.abodenha@google.com2011-05-181-0/+3
| | | | | | | | | | | | | | | Virtual_driver_setup now has localization support. All dlls and exes now have a version resource. Common (untranslated) strings are now pulled from a common resource file. Installer and port monitor now have separate .gyp files. Still to do: Integrate with TC and add all languages. BUG= TEST= Review URL: http://codereview.chromium.org/6930019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85825 0039d316-1c4b-4281-b951-d872f2087c98
* grit: Don't parse <messages> and children in --inputs and --outputs mode.thakis@chromium.org2011-05-142-16/+35
| | | | | | | | | | | | | | | | This speeds up `gclient runhooks` by 2 seconds (~10%) on my system. `gclient runhooks` runs grit_info in inputs and outputs mode about 20 times each. Interestingly, the speedup comes from making a single invocation each about 1s faster (for the grd file that contains almost all our strings). BUG=82230 TEST=None Review URL: http://codereview.chromium.org/6973066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85374 0039d316-1c4b-4281-b951-d872f2087c98
* grit: When gathering input files, don't do full inlining.thakis@chromium.org2011-05-141-5/+26
| | | | | | | | | | | This speeds up `gclient runhooks` by 0.5s (2.5%) on my machine. BUG=82230 TEST=none Review URL: http://codereview.chromium.org/7015063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85373 0039d316-1c4b-4281-b951-d872f2087c98
* grit: Split the main() function into a pure DoMain() and an impure part.thakis@chromium.org2011-05-141-8/+13
| | | | | | | | | | | | | | | This allows gyp to call grit_info.DoMain() directly, without having to go through the trouble of launching grit_info in a subprocess (but that will happen in a different CL, in gyp land). No intended functionality change. BUG=82230 TEST=none Review URL: http://codereview.chromium.org/6973068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85372 0039d316-1c4b-4281-b951-d872f2087c98
* Pre-requisites needed before applying content-security-policy to the HTML ↵tsepez@chromium.org2011-05-131-0/+3
| | | | | | | | | | | | | | | | | | | | options page. CSP is a second line of defense in case someone introduces an XSS in one of these pages. The changes to jstemplate_builder are to allow the template scripts to be served as resources where possible, and to return JS as well as HTML in the one case where the script is to be dynamically generated. The other changes are to combine the options javascript files into a single large file resource and to serve it from under chrome://settings. This satisfies the "no inline" rule and options.html can script src="" it. I did put one file into the /shared directory, since it is a companion to a piece of pre-existing template code alread in that directory. TEST=chrome://settings page loads properly. Review URL: http://codereview.chromium.org/7003007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85322 0039d316-1c4b-4281-b951-d872f2087c98
* There is a patch for new resource pak for devtools tab selection page.loislo@chromium.org2011-05-061-1/+5
| | | | | | | | | | | | | | | | | | We have a generated tab selection page for remote debugging. It is quite simple and needs to be extended for better discoverability and nice view. I've splitted it into three parts. Generated one with the list of tabs available for debugging and two static files devtools_frontend.css and devtools_frontend.js It was decided to keep these two files separately from the rest of the devtools files. The first reason: tab selection page can be platform specific. The second reason: main devtools files can be stored in the cloud. BUG=none TEST=none Review URL: http://codereview.chromium.org/6912023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84419 0039d316-1c4b-4281-b951-d872f2087c98
* Make sure grit unittests run on presubmit.tony@chromium.org2011-05-043-14/+10
| | | | | | | | | | | Previously, the return code was always 0 so the tests were always passing. Actually return an error code now. Also fix some tests that regressed in r83897 and r78357. Review URL: http://codereview.chromium.org/6929016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84099 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 84081 due to internal failure - grit: Completely ignore the ↵sadrul@chromium.org2011-05-041-3/+0
| | | | | | | | | | | | | | 'if'-nodes that do not evaluate to true. BUG=none TEST=builds work fine Review URL: http://codereview.chromium.org/6911026 TBR=sadrul@chromium.org Review URL: http://codereview.chromium.org/6932016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84097 0039d316-1c4b-4281-b951-d872f2087c98
* grit: Completely ignore the 'if'-nodes that do not evaluate to true.sadrul@chromium.org2011-05-041-0/+3
| | | | | | | | | BUG=none TEST=builds work fine Review URL: http://codereview.chromium.org/6911026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84081 0039d316-1c4b-4281-b951-d872f2087c98
* expand CSS attributes for which we inline imagesestade@chromium.org2011-05-031-1/+3
| | | | | | | | | | | I need this for -webkit-mask-image BUG=none TEST=manual (ntp most visited pins, g-button-basic [only accessible via inspector], etc.) Review URL: http://codereview.chromium.org/6909038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83984 0039d316-1c4b-4281-b951-d872f2087c98
* When grit flattens resources, make it include the name of the resourcetony@chromium.org2011-05-032-7/+7
| | | | | | | | | | (the IDR_ value) in the filename so we don't have naming clashes. BUG=69633 Review URL: http://codereview.chromium.org/6910005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83897 0039d316-1c4b-4281-b951-d872f2087c98
* Fix HTML/CSS image inlining broken by r83644 (it was matching ↵mihaip@chromium.org2011-05-031-1/+1
| | | | | | | | | | | background-image, but not background). BUG=81071 TEST=icon at top of bookmark manager appears Review URL: http://codereview.chromium.org/6889017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83824 0039d316-1c4b-4281-b951-d872f2087c98
* Switch web store promo button image to have an alpha channel,mihaip@chromium.org2011-04-301-2/+2
| | | | | | | | | | | | | | | | | so that it blends in with non-white NTP backgrounds. Since the current markup doesn't handle alpha channels well (the different sections overlap), redo it to use border-image. Also makes the button not wrap for longer label names. BUG=80233,80810 TEST=tried with non-default themes R=arv@chromium.org Review URL: http://codereview.chromium.org/6905089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83644 0039d316-1c4b-4281-b951-d872f2087c98
* Split out large icons into a separate resource paksail@chromium.org2011-04-212-1/+12
| | | | | | | | | | | | | | This is a part of r82185 that was reverted. The change was reverted because it caused a performance regression. I'm checking in just the reorganization code to narrow down exactly which part of the change caused the regression. The only code change here is some header includes. If this change passes the perf bot then my next change will be to load the new resource pak. BUG=None TEST=None Review URL: http://codereview.chromium.org/6883110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82538 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 82497 - Split out large icons into a separate resource pakThis is a ↵sail@chromium.org2011-04-212-12/+1
| | | | | | | | | part of r82185 that was reverted. The change was reverted because it caused a performance regression.I'm checking in just the reorganization code to narrow down exactly which part of the change caused the regression.The only code change here is some header includes. If this change passes the perf bot then my next change will be to load the new resource pak.BUG=NoneTEST=NoneReview URL: http://codereview.chromium.org/6883110 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/6879113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82502 0039d316-1c4b-4281-b951-d872f2087c98
* Split out large icons into a separate resource paksail@chromium.org2011-04-212-1/+12
| | | | | | | | | | | | | | | This is a part of r82185 that was reverted. The change was reverted because it caused a performance regression. I'm checking in just the reorganization code to narrow down exactly which part of the change caused the regression. The only code change here is some header includes. If this change passes the perf bot then my next change will be to load the new resource pak. BUG=None TEST=None Review URL: http://codereview.chromium.org/6883110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82497 0039d316-1c4b-4281-b951-d872f2087c98
* Revert high res icon changessail@chromium.org2011-04-202-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new high res icon change may have caused a perf regression. To verify I'm reverting the following chnages: commit 3a360c6b3d2fc174cb7597d6365cfc5418d1442b r82326 Disable loading high res icons on Mac commit 3c39226937a39d0042b8a794f13505c7a25ca58b r82247 Fix reload button unit test commit f87ab117fc159566868e71e4df5672852bebd718 r82245 Unregister toolbar view from window notifications commit 0b287ba4a4ad5c19d901f973eb9af594dcf3dba1 r82239 Fix failing Mac unit tests commit 8b681c46a139d12151323952c58122f6805d7597 r82236 Mac: Remove custom drawn buttons commit 6ae8a2fe40485731b86267e362936db16b4c0706 r82209 Fix clang build break commit e8a19d1e0c76f204c834318566e4206320583449 r82185 Add support for multi resolution icons BUG=None TEST=Compling Review URL: http://codereview.chromium.org/6878077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82352 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for multi resolution iconssail@chromium.org2011-04-192-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | To support HiDPI we need a way to load two copies of icons, a low resolution version and a high resolution version. To support this, this change does the following: - split theme_resource.grd into three files: - theme_resources.grd: icons that only have one resolution - theme_resources_standard.grd: low resolution icons - theme_resources_large.grd: high resolution icons - theme_resource.grd and theme_resources_standard.grd and compiled into chrome.pak/chrome.rc for all platforms. - theme_resources_large.grd is compiled into theme_resources_large.pak for platforms that want high resolution icons (currently only Mac) - gfx::Image now support icons with multiple resolution Currently not all ThemeService APIs return multi-resolution images. Once this is checked in I'll work on converting them as I go. Note, this change will have to be coordinated with the change to reorganize theme resources. I'll work with saintlou on that. BUG=75812 TEST=Added a TIFF to theme_resources.grd. Verified that the toolbar icon had a mutliresolution image. Verified that unit tests passed. Review URL: http://codereview.chromium.org/6849030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82185 0039d316-1c4b-4281-b951-d872f2087c98
* Mitigate XSS in the bookmark manager using Content-Security-Policy.abarth@chromium.org2011-04-142-15/+22
| | | | | | | | | We're adding support for Content-Security-Policy (CSP) support to WebKit, which helps prevent XSS by letting sites whitelist where they can load scripts from. This patch adds a CSP policy to the bookmark manager that only allows script loads from extensions and from "chrome" URLs. Adding the policy required only a tiny change the bookmark manager (moving the main script block to be external), but required changing some of the infrastructure for packing component extensions (to avoid inlining external scripts). CSP forbids inline script (and inline event handlers) because it can't tell whether those scripts are a result of XSS. Review URL: http://codereview.chromium.org/6831008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81658 0039d316-1c4b-4281-b951-d872f2087c98
* Roll out 81535 because it tickled an assert in URLRequestResourceBundleJob.abarth@chromium.org2011-04-142-22/+15
| | | | | | Review URL: http://codereview.chromium.org/6855001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81546 0039d316-1c4b-4281-b951-d872f2087c98
* Mitigate XSS in the bookmark manager using Content-Security-Policy.abarth@chromium.org2011-04-142-15/+22
| | | | | | | | | We're adding support for Content-Security-Policy (CSP) support to WebKit, which helps prevent XSS by letting sites whitelist where they can load scripts from. This patch adds a CSP policy to the bookmark manager that only allows script loads from extensions and from "chrome" URLs. Adding the policy required only a tiny change the bookmark manager (moving the main script block to be external), but required changing some of the infrastructure for packing component extensions (to avoid inlining external scripts). CSP forbids inline script (and inline event handlers) because it can't tell whether those scripts are a result of XSS. Review URL: http://codereview.chromium.org/6831008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81535 0039d316-1c4b-4281-b951-d872f2087c98
* Add whitelist support to grit.thomasvl@chromium.org2011-04-134-10/+82
| | | | | | | | | | | | | | | | | | - Support -w path to add whitelists to grit (and grit_info). - Use the whitelist to tag what items should be skipped when generating output. A whitelist is used instead of a blacklist, since there has been some other work into generating what resources are really needed by the build. Another option instead of whitelists would have been to add yet more conditions to the grd files, but they are already getting pretty complex with the conditions already in the files. And looking at trying to do conditions based on features not only made the files more complex, but also doesn't handle the problem when a single feature has some strings that are only valid for a subset of the supported platforms. Review URL: http://codereview.chromium.org/6821056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81393 0039d316-1c4b-4281-b951-d872f2087c98
* Support nested <if> tags for included html.xiyuan@chromium.org2011-04-052-10/+49
| | | | | | | | | | BUG=77971 TEST=Verify fix for issue 77971. STATUS=Fixed Review URL: http://codereview.chromium.org/6793021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80500 0039d316-1c4b-4281-b951-d872f2087c98
* Print a grit debugging hint to stdout when a parse exception occursrhashimoto@chromium.org2011-04-051-1/+3
| | | | | | | | | | | | | to help with locating the error in the .grd file. BUG=none TEST=none Review URL: http://codereview.chromium.org/6760030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80470 0039d316-1c4b-4281-b951-d872f2087c98
* Standardize grit invokesthomasvl@chromium.org2011-03-281-0/+3
| | | | | | | | | | | | | - Add two gypi files to src/build for the boilerplate added to targets and actions - Update grit_info to also support the -E flag so it can share more of the grit build commandline - switch over all but the webkit and webkit glue grd files to use the common support BUG=22247 TEST=everything still localized correctly Review URL: http://codereview.chromium.org/6705030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79548 0039d316-1c4b-4281-b951-d872f2087c98
* WinDDK ATL and MSVC express 2008/2005 compatability mark@chromium.org2011-03-212-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Compile the devtools grd file into a .pak file so wetony@chromium.org2011-03-175-5/+53
| | | | | | | | | | | | | | | | can include the data in resources.pak. To avoid resource ids colliding between files, we have a global file, resource_ids, that tracks the starting id values. Since the devtools grd file is generated, it's hard to add an entry to |resource_ids|. To work around this, add support for expanding variables in the |resource_ids|. BUG=35793 Review URL: http://codereview.chromium.org/6685061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78468 0039d316-1c4b-4281-b951-d872f2087c98
* Add ChromeOS as product name to the policy template generatorgfeher@chromium.org2011-03-163-20/+8
| | | | | | | | | | | And clean up other obsolate placeholders. BUG=none TEST=python:PolicyTemplateGenearator.* Review URL: http://codereview.chromium.org/6341007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78357 0039d316-1c4b-4281-b951-d872f2087c98
* Carnitas: Move app_strings to ui/base/stringssail@chromium.org2011-03-081-2/+2
| | | | | | | | | | To fix circular dependencies between ui/base/ui_base.gyp and app/app.gyp I'm moving app_strings to ui/base/strings. BUG=72317 TEST=Compiled on Mac, Linux, Windows. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77337 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 77068 - Carnitas: Move app_strings to ui/base/stringssail@chromium.org2011-03-071-2/+2
| | | | | | | | | | | | | | To fix circular dependencies between ui/base/ui_base.gyp and app/app.gyp I'm moving app_strings to ui/base/strings. BUG=72317 TEST=Compiled on Mac, Linux, Windows. Review URL: http://codereview.chromium.org/6541035 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/6623055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77142 0039d316-1c4b-4281-b951-d872f2087c98
* Carnitas: Move app_strings to ui/base/stringssail@chromium.org2011-03-061-2/+2
| | | | | | | | | | | To fix circular dependencies between ui/base/ui_base.gyp and app/app.gyp I'm moving app_strings to ui/base/strings. BUG=72317 TEST=Compiled on Mac, Linux, Windows. Review URL: http://codereview.chromium.org/6541035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77068 0039d316-1c4b-4281-b951-d872f2087c98
* Fix ADMX template format for Windows Server 2008gfeher@chromium.org2011-03-021-1/+1
| | | | | | | | | BUG=none TEST=Try to open chrome.admx on Windows Server 2008 with gpedit Review URL: http://codereview.chromium.org/6602082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76527 0039d316-1c4b-4281-b951-d872f2087c98
* Move src/gfx/ to src/ui/gfxsail@chromium.org2011-02-021-1/+1
| | | | | | | | | | | To reduce the size of this change I've left stub header files in src/gfx/. Once all includes have been updated I'll delete the stub files. BUG=71063 TEST=Still doing test builds. Review URL: http://codereview.chromium.org/6246027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73530 0039d316-1c4b-4281-b951-d872f2087c98
* Cloud print proxy enablement under policy control.scottbyer@chromium.org2011-02-021-3/+16
| | | | | | | | | | | | Implement policy control of the cloud print policy, in just the UI part for now (in the service requires some refactoring). BUG=59769 TEST=Change the policy and verifying that the UI in Under the Hood gets disabled or enabled properly, with the policy notification at the top. Review URL: http://codereview.chromium.org/6344013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73523 0039d316-1c4b-4281-b951-d872f2087c98
* Add presubmit checks for grit. This runs the unittests.tony@chromium.org2011-02-024-10/+40
| | | | | | | | | | | | | | | Fix the grd_reader tests to pass if run from any directory (previously, it had to be run from tools/grit). Fix rc_unittest to pass on Linux (it was sensitive to line endings). If the user doesn't have access to the internal repository, there will be lots of failures :( Maybe there's a way to detect this case and skip the tests? Review URL: http://codereview.chromium.org/6349026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73498 0039d316-1c4b-4281-b951-d872f2087c98
* Add a grit define for enabling third_party translations.tony@chromium.org2011-02-017-30/+57
| | | | | | | | | | | | | Turn it off by default and add conditions to chromium_strings.grd for third_party specific outputs. Add the ability to filter xtb files (translations) using if nodes. TEST=still able to compile chrome Review URL: http://codereview.chromium.org/6392033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73314 0039d316-1c4b-4281-b951-d872f2087c98
* Provide better error messages when grit fails to open a file whiletony@chromium.org2011-01-271-2/+10
| | | | | | | | | | flattening. BUG=70185 Review URL: http://codereview.chromium.org/6401001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72853 0039d316-1c4b-4281-b951-d872f2087c98
* Allow ADM(X) templates to manage both MACHINE and USER policiesgfeher@chromium.org2011-01-273-90/+168
| | | | | | | | | | | ADMX policies will have the XML attribute class set to "both", ADM policies will be presented twice, once under CLASS MACHINE, and once under CLASS USER. BUG=70232 TEST=Add chrome.adm to Group Policy Editor and see if Chrome policies appear both under User Configuration and Machine Configuration, and they can be configured independently. Repeat this with chrome.admx. Review URL: http://codereview.chromium.org/6327011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72792 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: update inspector_strings.grd to match current Inspector'smnaganov@chromium.org2011-01-241-3/+0
| | | | | | | | | | | | | | strings, delete devtools_strings.grd. These strings are only used for Ubuntu Chromium translations, not affecting Chrome release process. BUG=none TEST=none Review URL: http://codereview.chromium.org/6273009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72329 0039d316-1c4b-4281-b951-d872f2087c98
* Fix generating descriptions of policy template stringsgfeher@chromium.org2011-01-192-3/+24
| | | | | | | | | BUG=none TEST=python:PolicyJsonUnittest.* Review URL: http://codereview.chromium.org/6312006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71808 0039d316-1c4b-4281-b951-d872f2087c98
* Remove 'annotations' dictionary in policy_definitions.json.jkummerow@chromium.org2011-01-188-106/+47
| | | | | | | | | | | The former members of the dict are now included directly in the policy definitions. BUG=64898 TEST=existing unit tests in tools/grit/grit/format/policy_templates/ Review URL: http://codereview.chromium.org/6360002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71635 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit DEPS past WebKit move. Update gyp files and include paths to ↵abarth@chromium.org2011-01-171-1/+1
| | | | | | reflect the move. Consolidate how we DEPS in WebKit source files. Cross fingers. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71586 0039d316-1c4b-4281-b951-d872f2087c98
* [grit] Avoid intermediate files for HTML inlining when building .pak filesakalin@chromium.org2011-01-146-33/+88
| | | | | | | | | | | | This avoids problems where multiple invocations of grit try to write to the same intermediate file. BUG=69633 TEST=Manually Review URL: http://codereview.chromium.org/6245002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71491 0039d316-1c4b-4281-b951-d872f2087c98
* [Sync] Port about:sync to DOMUIakalin@chromium.org2011-01-141-0/+3
| | | | | | | | | | | | | | | | | Write chrome://sync-internals DOMUI page which is like about:sync but automatically updates on sync events. Make about:sync{,-internals} aliases for chrome://sync-internals. More diagnostic capabilities will be added to chrome://sync-internals in future CLs. BUG=69500 TEST=Manual Review URL: http://codereview.chromium.org/6299002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71435 0039d316-1c4b-4281-b951-d872f2087c98
* Integrate user strings into the JSON policy template filegfeher@chromium.org2011-01-1430-775/+1200
| | | | | | | | | | | The new concept is the following: policy_templates.json contains all the data necessary to generate templates: policy names, English captions, descriptions, etc. This gets translated the following GRIT gatherer: policy_json.py. The text of the translated JSON file is then picked up, parsed, and passed to the writers by template_formatter.py. BUG=64898 TEST=PolicyJsonUnittest.* Review URL: http://codereview.chromium.org/6134006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71421 0039d316-1c4b-4281-b951-d872f2087c98
* Support int-typed policies in policy template generatorjkummerow@chromium.org2011-01-1315-40/+283
| | | | | | | | | | | Also fix bug 69054 (reg_writer erroneously outputs integers as decimal values). BUG=68843, 69054 TEST=tools/grit/grit/format/policy_templates/*_unittest.py Review URL: http://codereview.chromium.org/6176005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71316 0039d316-1c4b-4281-b951-d872f2087c98