Revert 141573 - 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
===================================================================
--- chrome/browser/ui/views/frame/browser_view.cc	(revision 141597)
+++ chrome/browser/ui/views/frame/browser_view.cc	(working copy)
@@ -519,7 +519,7 @@
 gfx::ImageSkia BrowserView::GetOTRAvatarIcon() const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::ImageSkia* otr_avatar =
-      rb.GetNativeImageNamed(GetOTRIconResourceID()).ToImageSkia();
+      rb.GetNativeImageNamed(IDR_OTR_ICON).ToImageSkia();
   return *otr_avatar;
 }
 
@@ -1783,20 +1783,6 @@
   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)
-    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;
 }