Merge grd files in ui/resources and chrome/app/theme

This CL moves the contents of ui_resources_standard.grd into 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

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=146224

[oshima, 2012-07-10 15:11:23]

lgtm

http://codereview.chromium.org/10756018/diff/3003/chrome/browser/resources_ut...
File chrome/browser/resources_util.cc (right):

http://codereview.chromium.org/10756018/diff/3003/chrome/browser/resources_ut...
chrome/browser/resources_util.cc:25: }
nuke {}

[sail, 2012-07-10 21:23:05]

Can you remove the {} in the CL description and explicitly state what's been
merged/removed?

Also, are any .pak files removed as a result of this change? (For example, does
ui_resourses.pak still exist?).

Also, how to the pak and .rc files differ and which ones should be packaged into
the app. For example, what's the difference between these three:
  - ui_resources.pak
  - ui_resources_standard.pak
  - ui_resources.rc

[benrg, 2012-07-10 22:56:48]

sail, sorry about the missing CL description. I wrote one which hopefully
answers all your questions.

http://codereview.chromium.org/10756018/diff/3003/chrome/browser/resources_ut...
File chrome/browser/resources_util.cc (right):

http://codereview.chromium.org/10756018/diff/3003/chrome/browser/resources_ut...
chrome/browser/resources_util.cc:25: }
On 2012/07/10 15:11:23, oshima wrote:
> nuke {}

Done.

[sail, 2012-07-10 23:00:42]

On 2012/07/10 22:56:48, benrg wrote:
> sail, sorry about the missing CL description. I wrote one which hopefully
> answers all your questions.

Awesome!
One thing I'm still not sure about. Is the theme_resources.rc file a duplicate
of theme_resources_standard.pak? If so then do we need to make any changes so
that the Windows build doesn't pull in both?

[benrg, 2012-07-10 23:21:32]

On 2012/07/10 23:00:42, sail wrote:
> One thing I'm still not sure about. Is the theme_resources.rc file a
> duplicate of theme_resources_standard.pak? If so then do we need to
> make any changes so that the Windows build doesn't pull in both?

Unfortunately, this is an excellent question. The two rc files are duplicates of
the corresponding pak files, and I guess they will get pulled into Windows
builds. I'm not sure why they exist at all -- for the Explorer icon, I guess?
Anything else? Oshima, please help.

At the very least, I should have named them with the _standard extension.

[sail, 2012-07-10 23:29:06]

On 2012/07/10 23:21:32, benrg wrote:
> On 2012/07/10 23:00:42, sail wrote:
> > One thing I'm still not sure about. Is the theme_resources.rc file a
> > duplicate of theme_resources_standard.pak? If so then do we need to
> > make any changes so that the Windows build doesn't pull in both?
> 
> Unfortunately, this is an excellent question. The two rc files are duplicates
of
> the corresponding pak files, and I guess they will get pulled into Windows
> builds. I'm not sure why they exist at all -- for the Explorer icon, I guess?
> Anything else? Oshima, please help.
> 
> At the very least, I should have named them with the _standard extension.

The .rc files are compiled into the chrome executable. We should use them
instead of the .pak files.

Without this change we have the following files:
   - theme_resources.rc (used by Windows Chrome)
   - theme_resources.pak (used by Mac/Linux, not by Windows)
   - theme_resources_standard.pak (used by Windows/Mac/Linux)

With your change it looks like we have the following:
   - theme_resources.rc (used by Windows)
   - theme_resources_standard.pak (used by Mac/Linux, used by Windows but
shouldn't be)

To fix this all you need to do is stop packaging theme_resources.pak into the
Windows build. (You can do this as a separate CL if you like.)

[benrg, 2012-07-11 15:58:17]

On 2012/07/10 23:29:06, sail wrote:
> To fix this all you need to do is stop packaging theme_resources.pak
> into the Windows build. (You can do this as a separate CL if you like.)

I think I'd rather do it as a separate CL because this one is painful to rebase.

[sail, 2012-07-11 16:49:06]

On 2012/07/11 15:58:17, benrg wrote:
> On 2012/07/10 23:29:06, sail wrote:
> > To fix this all you need to do is stop packaging theme_resources.pak
> > into the Windows build. (You can do this as a separate CL if you like.)
> 
> I think I'd rather do it as a separate CL because this one is painful to
rebase.

Sounds good. LGTM!

[commit-bot: I haz the power, 2012-07-11 18:42:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benrg@chromium.org/10756018/13287

[commit-bot: I haz the power, 2012-07-11 18:44:59]

Presubmit check for 10756018-13287 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    chrome/browser/ui/gtk
    chrome/browser/ui/views/ash/launcher
    chrome/browser/bookmarks
    chrome/browser/ui/views/bookmarks
    chrome/browser/ui/views/tabs
    chrome/browser/ui/views/ash/app_list
    ui/views
    content/browser/web_contents
    chrome/browser/ui/search_engines
    chrome/browser/ui/website_settings
    content
    chrome/browser/history
    chrome/browser/ui/webui/options2
    chrome/browser/ui/pdf
    chrome/browser/ui/views/ash
    chrome/browser/ui/sync
    chrome/browser/ui/views/website_settings
    chrome/browser/ui/intents
    ui/compositor
    webkit
    ash
    chrome/browser/ui/content_settings
    chrome/browser/ui/panels
    chrome/browser/chromeos/status
    ash/system
    chrome/browser/ui/webui
    ui/aura
    ui
    chrome/browser/ui

Presubmit checks took 15.1s to calculate.

[commit-bot: I haz the power, 2012-07-11 19:02:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benrg@chromium.org/10756018/13287

[stevenjb, 2012-07-11 19:34:43]

chrome/browser/chromeos/status/ lgtm

[darin (slow to review), 2012-07-11 19:42:59]

LGTM for src/content/ changes

[Ben Goodger (Google), 2012-07-11 19:44:43]

lgtm

[commit-bot: I haz the power, 2012-07-11 20:36:15]

Commit queue rejected this change because the description was changed
between the time the change entered the commit queue and the time it
was ready to commit. You can safely check the commit box again.

[commit-bot: I haz the power, 2012-07-11 20:39:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benrg@chromium.org/10756018/13287

[commit-bot: I haz the power, 2012-07-11 22:20:30]

Change committed as 146224