make bubble_border to use resources under ui/resources.

make bubble_border to use resources under ui/resources.


BUG=none
TEST=none

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=96817
=> Then was reverted

New CL is http://codereview.chromium.org/7663001/

[alicet1, 2011-08-06 15:08:33]

hi,

The change is in preparation of bubble code move.

thanx,
alice

[sky, 2011-08-08 16:23:34]

http://codereview.chromium.org/7584007/diff/2001/chrome/chrome.gyp
File chrome/chrome.gyp (right):

http://codereview.chromium.org/7584007/diff/2001/chrome/chrome.gyp#newcode1623
chrome/chrome.gyp:1623:
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large/ui_resources_large.pak',
Can this be put at line 1617 and the new conditional you're adding removed?

http://codereview.chromium.org/7584007/diff/2001/tools/grit/resource_ids
File tools/grit/resource_ids (right):

http://codereview.chromium.org/7584007/diff/2001/tools/grit/resource_ids#newc...
tools/grit/resource_ids:157: "ui/resources/ui_resources_large.grd": {
Put this right next to ui_resources and use the same comment as on line 134.

http://codereview.chromium.org/7584007/diff/2001/ui/ui_resources.gypi
File ui/ui_resources.gypi (right):

http://codereview.chromium.org/7584007/diff/2001/ui/ui_resources.gypi#newcode25
ui/ui_resources.gypi:25: 'target_name': 'ui_resources_large',
Don't we also need ui_resources_standard?

[alicet1, 2011-08-09 08:12:26]

http://codereview.chromium.org/7584007/diff/2001/chrome/chrome.gyp
File chrome/chrome.gyp (right):

http://codereview.chromium.org/7584007/diff/2001/chrome/chrome.gyp#newcode1623
chrome/chrome.gyp:1623:
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large/ui_resources_large.pak',
On 2011/08/08 16:23:35, sky wrote:
> Can this be put at line 1617 and the new conditional you're adding removed?

Done.

http://codereview.chromium.org/7584007/diff/2001/tools/grit/resource_ids
File tools/grit/resource_ids (right):

http://codereview.chromium.org/7584007/diff/2001/tools/grit/resource_ids#newc...
tools/grit/resource_ids:157: "ui/resources/ui_resources_large.grd": {
On 2011/08/08 16:23:35, sky wrote:
> Put this right next to ui_resources and use the same comment as on line 134.

added ui_resources_standard.grd also. Didn't move to below ui_resources.grd --
the comment on L134 seems to suggest _standard.grd and _large.grd should use the
same resource id, but not the non-standard non-large version. Let me know if I
should still move it up.

http://codereview.chromium.org/7584007/diff/2001/ui/ui_resources.gypi
File ui/ui_resources.gypi (right):

http://codereview.chromium.org/7584007/diff/2001/ui/ui_resources.gypi#newcode25
ui/ui_resources.gypi:25: 'target_name': 'ui_resources_large',
On 2011/08/08 16:23:35, sky wrote:
> Don't we also need ui_resources_standard?

added. also moved the bubble resources to ui_resources_standard.grd instead.

[Emmanuel Saint-loubert-Bié, 2011-08-12 14:09:15]

Hi Scott,

I ran the trybots in this CL on behalf of alicet and everyhtign was green (see
below). Can you please approve the CL. And I will land it for her. Thanks

try success for 'saintlou: alicet#91a8e' try job on mac @ r96354
http://build.chromium.org/p/tryserver.chromium/builders/mac/builds/42550

try success for 'saintlou: alicet#91a8e' try job on linux_view @ r96354
http://build.chromium.org/p/tryserver.chromium/builders/linux_view/builds/8030

try success for 'saintlou: alicet#91a8e' try job on linux_chromeos @ r96354
http://build.chromium.org/p/tryserver.chromium/builders/linux_chromeos/builds...

try success for 'saintlou: alicet#91a8e' try job on mac_gcc @ r96354
http://build.chromium.org/p/tryserver.chromium/builders/mac_gcc/builds/12

try success for 'saintlou: alicet#91a8e' try job on linux @ r96354
http://build.chromium.org/p/tryserver.chromium/builders/linux/builds/42241

[Emmanuel Saint-loubert-Bié, 2011-08-15 17:45:33]

Hi Alice

The reason your CL fails on Touch is that you have removed 4 lines in
chrome/app/theme/theme_resources_large.grd but did not in 	
chrome/app/theme/theme_resources_standard.grd s
I suspect that you want to add these 4 lines back.

    <include name="IDR_CLOSE_BAR" file="large_close_bar.png" type="BINDATA" />	
    <include name="IDR_CLOSE_BAR_H" file="large_close_bar_h.png" type="BINDATA
     " />	
    <include name="IDR_CLOSE_BAR_MASK" file="large_close_bar_mask.png" type="B
     INDATA" />	
    <include name="IDR_CLOSE_BAR_P" file="large_close_bar_p.png" type="BINDATA
     " />

http://codereview.chromium.org/7584007/diff/7001/chrome/app/theme/theme_resou...
File chrome/app/theme/theme_resources_large.grd (left):

http://codereview.chromium.org/7584007/diff/7001/chrome/app/theme/theme_resou...
chrome/app/theme/theme_resources_large.grd:54: <include
name="IDR_BUBBLE_T_ARROW" file="large_bubble_pointer_t.png" type="BINDATA" />
You should not remove the 4 resources below (IDR_CLOSE_BAR, IDR_CLOSE_BAR_H,
IDR_CLOSE_BAR_MASK and IDR_CLOSE_BAR_P)

[Emmanuel Saint-loubert-Bié, 2011-08-15 18:46:31]

LGTM

[alicet1, 2011-08-15 18:52:27]

http://codereview.chromium.org/7584007/diff/7001/chrome/app/theme/theme_resou...
File chrome/app/theme/theme_resources_large.grd (left):

http://codereview.chromium.org/7584007/diff/7001/chrome/app/theme/theme_resou...
chrome/app/theme/theme_resources_large.grd:54: <include
name="IDR_BUBBLE_T_ARROW" file="large_bubble_pointer_t.png" type="BINDATA" />
On 2011/08/15 17:45:33, Emmanuel Saint-loubert wrote:
> You should not remove the 4 resources below (IDR_CLOSE_BAR, IDR_CLOSE_BAR_H,
> IDR_CLOSE_BAR_MASK and IDR_CLOSE_BAR_P)

Indeed!

[Ben Goodger (Google), 2011-08-16 19:37:33]

LGTM when green.

http://codereview.chromium.org/7584007/diff/15013/tools/grit/resource_ids
File tools/grit/resource_ids (right):

http://codereview.chromium.org/7584007/diff/15013/tools/grit/resource_ids#new...
tools/grit/resource_ids:162: "includes": [24000],
I don't think you can use identical values for this field. Perhaps that's your
problem.

[Emmanuel Saint-loubert-Bié, 2011-08-16 19:48:50]

Hi Ben, Actually that is how we deal with having both large and standard sizes
on Mac (sail knows the details) where we can switch at run time between the
sizes. 
Alice figured out the issue on Windows which was with the chrome_dll.gypi and
has been uploaded in the sibling CL http://codereview.chromium.org/7663001/ (can
you LGTM that one actually?) Thanks!

-- Emmanuel