Update use of OTR avatars for touch. We now select

chrome/app/theme/theme_resources_standard.grd

Index: chrome/app/theme/theme_resources_standard.grd
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
index 381fd305abdc6c7b8a97065814ac5ff3246e7bf8..743ce44a191170f667b1b57bcdf61d2e3bf31201 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -157,6 +157,7 @@
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="default_100_percent/ev_bubble_l.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="default_100_percent/ev_bubble_r.png" type="BINDATA" />
       <include name="IDR_OTR_ICON" file="default_100_percent/otr_icon.png" type="BINDATA" />
+      <include name="IDR_OTR_ICON_FULLSCREEN" file="default_100_percent/otr_icon.png" type="BINDATA" />

[benrg, 2012/06/11 20:35:45]

This resource ID is never used in non-touch, so this is a dummy image and could
point to anything. It's going to be a problem when these files (finally) get
merged, since there will just be a single <structure> pointing to
otr_icon_fullscreen, which won't exist in default_[12]00_percent. Do you know
what the plan is for this situation?

(Also in theme_resources_2x.grd)

[Jói, 2012/06/11 22:53:42]

We could have these point to a 1x1 image in layouts where the resource is not
used.  I think this would also work once we collapse to a single <structure>
node for the resources, i.e. as long as we provide a file for each layout that
file will get used.

       <include name="IDR_PLUGIN" file="default_100_percent/plugin.png" type="BINDATA" />
       <if expr="pp_ifdef('toolkit_views')">
         <include name="IDR_RELOAD" file="default_100_percent/ash/browser_reload_normal.png" type="BINDATA" />