tools/gritsettings/resource_ids - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/gritsettings/resource_ids

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tools/gritsettings/resource_ids

diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids

index 99183486d93ed93de950c157363ffb714551f46d..97505aec877437f6ee5e9bca60c099f938bda291 100644

--- a/tools/gritsettings/resource_ids

+++ b/tools/gritsettings/resource_ids

@@ -48,9 +48,11 @@

"ui/resources/ui_resources.grd": {

"includes": [5500],

+ "structures": [24000],

"chrome/app/theme/theme_resources.grd": {

"includes": [6000],

+ "structures": [21000],

"chrome_frame/resources/chrome_frame_resources.grd": {

"includes": [6500],

@@ -147,9 +149,6 @@

"devtools_resources.grd": {

"includes": [20500],

- "chrome/app/theme/theme_resources_standard.grd": {

- "structures": [21000],

- },

# This file is generated during the build.

"chrome/browser/debugger/frontend/devtools_discovery_page_resources.grd": {

"includes": [21500],

@@ -166,9 +165,6 @@

"chrome/browser/resources/quota_internals_resources.grd": {

"includes": [23000],

- "ui/resources/ui_resources_standard.grd": {

- "structures": [24000],

- },

"content/content_resources.grd": {

"includes": [24500],

« no previous file with comments | « content/content_shell.gypi ('k') | ui/DEPS » ('j') | no next file with comments »