summaryrefslogtreecommitdiffstats
path: root/ui/ui_resources.gypi
Commit message (Collapse)AuthorAgeFilesLines
* This CL moves the contents of ui_resources_standard.grd into ↵benrg@chromium.org2012-07-111-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ui_resources.grd and theme_resources_standard.grd into theme_resources.grd. This also eliminates the following Grit outputs: ui_resources.pak ==> duplicated in each scaled-resource pak ui_resources_standard.h ==> merged into ui_resources.h ui_resources_standard_map.h ==> renamed to ui_resources_map.h ui_resources_standard_map.cc ==> renamed to ui_resources_map.cc theme_resources.rc ==> merged into theme_resources_standard.rc theme_resources.pak ==> duplicated in each scaled-resource pak theme_resources_standard.h ==> merged into theme_resources.h theme_resources_standard_map.h ==> merged into theme_resources_map.h theme_resources_standard_map.cc ==> merged into theme_resources_map.cc The image duplication is intentional; we may revisit this later. Currently the standard-size images are included twice in the Windows build, once as an rc and once as a pak. I'll fix this in a followup CL. TBR=ben@chromium.org,brettw@chromium.org,darin@chromium.org,stevenjb@chromium.org BUG=133570 TEST=Trybots, local build Review URL: https://chromiumcodereview.appspot.com/10756018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146224 0039d316-1c4b-4281-b951-d872f2087c98
* Merge scalable-image grd files using new support in Grit (r51).benrg@chromium.org2012-06-181-51/+0
| | | | | | | | | | | | | | | {theme,ui}_resources_{standard,2x,touch,touch_1x,touch_2x}.grd are merged into {theme,ui}_resources_standard.grd. The only visible change should be that theme_resources_2x used to point to the 100% version of settings_favicon.png, but now picks up the 200% version. I checked the 200% image and it looks fine. Note that this changes the resource IDs because of a grit bug related to processing of <if> nodes. BUG=131216 TEST=Existing tests, visual inspection, pak files unchanged except for settings_favicon.png and different resource IDs Review URL: https://chromiumcodereview.appspot.com/10562030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142766 0039d316-1c4b-4281-b951-d872f2087c98
* Merge native_theme resources into ui_resources_standardoshima@chromium.org2012-05-261-0/+10
| | | | | | | | | BUG=124566 TEST=none Review URL: https://chromiumcodereview.appspot.com/10447003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139178 0039d316-1c4b-4281-b951-d872f2087c98
* Add 2x touch grid file for CrOSpkotwicz@chromium.org2012-05-241-0/+17
| | | | | | | | | BUG=128555 TEST=Compiles Review URL: https://chromiumcodereview.appspot.com/10383231 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138699 0039d316-1c4b-4281-b951-d872f2087c98
* Use touch friendly window buttons in aura when using --touch-optimized-ui.flackr@chromium.org2012-04-271-0/+17
| | | | | | | | | | | | I have increased the padding in the assets used for the buttons when running with touch optimized ui enabled. BUG=115520 TEST=Run with --touch-optimized-ui and verify that maximize and close buttons are large and all assets look correct. Review URL: http://codereview.chromium.org/10159002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134376 0039d316-1c4b-4281-b951-d872f2087c98
* Rename _large.grd to _2x.grdthakis@chromium.org2012-02-071-5/+5
| | | | | | | | | | BUG=111101 TEST=none Review URL: http://codereview.chromium.org/9307110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120838 0039d316-1c4b-4281-b951-d872f2087c98
* Make bubble_border use resources under ui/resources.saintlou@chromium.org2011-08-161-0/+34
| | | | | | | | | | | This issue was originally http://codereview.chromium.org/7584007/ BUG=none TEST=none Review URL: http://codereview.chromium.org/7663001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97054 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 96817 - make bubble_border to use resources under ui/resources.georgey@chromium.org2011-08-151-34/+0
| | | | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/7584007 TBR=saintlou@chromium.org Review URL: http://codereview.chromium.org/7648040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96849 0039d316-1c4b-4281-b951-d872f2087c98
* make bubble_border to use resources under ui/resources.saintlou@chromium.org2011-08-151-0/+34
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/7584007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96817 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the comments setting emands and vim tab width and expansion variables.tony@chromium.org2011-07-111-6/+0
| | | | | | | | | | | | | | | | | These were added in r28089 (http://codereview.chromium.org/256059) but are unnecessary bloat for everyone to carry around, even those that don't use emacs or vim. In an earlier change, I added editor config files in src/tools/emacs/ and src/tools/vim/ so users of the appropriate editor can source those instead. BUG=none TEST=none Review URL: http://codereview.chromium.org/7310019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92046 0039d316-1c4b-4281-b951-d872f2087c98
* Move app/resources/* to ui/resources/ directory.tfarina@chromium.org2011-06-291-0/+31
BUG=72317 TEST=None R=rsesek@chromium.org Review URL: http://codereview.chromium.org/7253057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91010 0039d316-1c4b-4281-b951-d872f2087c98