Revert 141573 - Update use of OTR avatars for touch. We now select
commita81856f076631fafa379333a8c2e3b96d03ac8b0
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Tue, 12 Jun 2012 02:18:45 +0000 (12 02:18 +0000)
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Tue, 12 Jun 2012 02:18:45 +0000 (12 02:18 +0000)
tree4c8d09c2870bd941e4a3c215e70577deb6928107
parent88f551703cf3a74a1676f814f347ceaecc7dcc75
Revert 141573 - Update use of OTR avatars for touch.  We now select
IDR_OTR_ICON_FULLSCREEN when in touch layout and either fullscreen or
running in Metro.

BUG=131698

Review URL: https://chromiumcodereview.appspot.com/10538082

TBR=joi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10538099

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141598 0039d316-1c4b-4281-b951-d872f2087c98
chrome/app/theme/theme_resources_2x.grd
chrome/app/theme/theme_resources_standard.grd
chrome/app/theme/theme_resources_touch_1x.grd
chrome/app/theme/theme_resources_touch_2x.grd
chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
chrome/browser/ui/views/frame/browser_view.cc
chrome/browser/ui/views/frame/browser_view.h