Merge themes/default.pak into chrome.pak for Mac and Linux builds.

Merge themes/default.pak into chrome.pak for Mac and Linux builds.

In theory this should result in a slightly faster app startup.

I will do a follow up change to merge it on Windows and get rid of
the code related to the extra file.

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

[tony, 2009-10-30 21:10:15]

Try bot results:

http://build.chromium.org/buildbot/try-server/builders/linux/builds/5944
http://build.chromium.org/buildbot/try-server/builders/mac/builds/5997
http://build.chromium.org/buildbot/try-server/builders/win/builds/6279

I think I need to update some installer scripts too?

[Mark Mentovai, 2009-10-30 21:16:22]

I think merging is a good idea.

I don't know anything about installer scripts.  Certainly there's nothing you'll
need to worry about on the Mac.  But when I do changes like this, I like to
include a little post-build step to remove, say, theme.pak, from the app that
gets built.  See, for example, r30188 and http://codereview.chromium.org/334040
for when I recently nuked some of that stuff after it had been live for a few
weeks.

http://codereview.chromium.org/344038/diff/1/2
File app/resource_bundle_linux.cc (right):

http://codereview.chromium.org/344038/diff/1/2#newcode113
Line 113: theme_data_ = resources_data_;
This is kind of stupid, why don't we just get rid of theme_data_ throughout and
use resources_data_?

As you've written it, there's actually a potential problem.  A caller that calls
LoadThemeResources before LoadResources will get crap for theme_data_ and crash.

Ideally we'd harden LoadResources against being asked to load more than once,
and then we could just make LoadThemeResources be a call straight through to
LoadResources.

http://codereview.chromium.org/344038/diff/1/3
File app/resource_bundle_mac.mm (right):

http://codereview.chromium.org/344038/diff/1/3#newcode1
Line 1: // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
Same comments apply in this file.  See bug 25891.

[tony, 2009-10-30 22:06:51]

I also added a postbuild rule to delete <(INTERMEDIATE_DIR)/repack/theme.pak on
mac.  I ran it through the trybots but didn't see the command in the output:
http://build.chromium.org/buildbot/try-server/builders/mac/builds/6012

Maybe that's expected? I don't see the ln that happens above either.

http://codereview.chromium.org/344038/diff/1/2
File app/resource_bundle_linux.cc (right):

http://codereview.chromium.org/344038/diff/1/2#newcode113
Line 113: theme_data_ = resources_data_;
On 2009/10/30 21:16:22, Mark Mentovai wrote:
> This is kind of stupid, why don't we just get rid of theme_data_ throughout
and
> use resources_data_?
> 
> As you've written it, there's actually a potential problem.  A caller that
calls
> LoadThemeResources before LoadResources will get crap for theme_data_ and
crash.
> 
> Ideally we'd harden LoadResources against being asked to load more than once,
> and then we could just make LoadThemeResources be a call straight through to
> LoadResources.

I will get rid of theme_data_ once I make the change on windows.  Currently we
reference theme_data_ in the shared code in resource_bundle.cc.

I added a DCHECK here to make sure that resources_data_ has already been
initialized.

[TVL, 2009-10-30 22:20:27]

do we need to do anything about inputs/outputs or is that all still right?

[Mark Mentovai, 2009-10-30 23:49:56]

Tom, is this what you meant?

http://codereview.chromium.org/344038/diff/6001/7003
File chrome/chrome.gyp (left):

http://codereview.chromium.org/344038/diff/6001/7003#oldcode3901
Line 3901: 'action_name': 'repack_theme',
...and got rid of them here.

http://codereview.chromium.org/344038/diff/6001/7003
File chrome/chrome.gyp (right):

http://codereview.chromium.org/344038/diff/6001/7003#newcode3890
Line 3890: '<(grit_out_dir)/theme_resources.pak',
TVL: Tony added theme_resources.pak and app_resources.pak here...

[TVL, 2009-11-01 01:13:29]

yup, went to fast before.