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 c3a7a1083fcc362051d451f9431fef784bff26a6..abcb949fe5a499e430168c4d1d65052c9155be83 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -518,7 +518,7 @@ TabContentsWrapper* BrowserView::GetSelectedTabContentsWrapper() 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;
 }
 
@@ -1779,6 +1779,20 @@ void BrowserView::OnSysColorChange() {
   browser::MaybeShowInvertBubbleView(browser_->profile(), contents_);
 }
 
+int BrowserView::GetOtrIconResourceID() const {

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

I asked glen@ and he says this is correct.

Nit: you could save a line by dropping the variable and using three return
statements.

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

Thanks for checking.

Re the extra line:  I prefer to avoid multiple returns out of functions if it's
easy.

+  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;
 }