Update use of OTR avatars for touch. We now select

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index b796c91a50ebd871b368a0e64507f6483ab56d73..e840de3abbf3720f7155e8b8ace703592f7cdacc 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -519,7 +519,7 @@ TabContents* BrowserView::GetActiveTabContents() const {
 gfx::ImageSkia BrowserView::GetOTRAvatarIcon() const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::ImageSkia* otr_avatar =
-      rb.GetNativeImageNamed(IDR_OTR_ICON).ToImageSkia();
+      rb.GetNativeImageNamed(GetOTRIconResourceID()).ToImageSkia();
   return *otr_avatar;
 }
 
@@ -1783,6 +1783,20 @@ void BrowserView::OnSysColorChange() {
   browser::MaybeShowInvertBubbleView(browser_->profile(), contents_);
 }
 
+int BrowserView::GetOTRIconResourceID() const {
+  int otr_resource_id = IDR_OTR_ICON;
+  if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
+    if (IsFullscreen())
+      otr_resource_id = IDR_OTR_ICON_FULLSCREEN;
+#if defined(OS_WIN) && !defined(USE_AURA)
+    if (base::win::GetMetroModule() != NULL)
+      otr_resource_id = IDR_OTR_ICON_FULLSCREEN;
+#endif
+  }
+
+  return otr_resource_id;
+}
+
 views::LayoutManager* BrowserView::CreateLayoutManager() const {
   return new BrowserViewLayout;
 }