Remove touch layout

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 535 matching lines @@
 }
 
 bool BrowserView::IsGuestSession() const {
   return browser_->profile()->IsGuestSession();
 }
 
 bool BrowserView::IsRegularOrGuestSession() const {
   return profiles::IsRegularOrGuestSession(browser_.get());
 }
 
-int BrowserView::GetOTRIconResourceID() const {
-  if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH && IsFullscreen())
-    return IDR_OTR_ICON_FULLSCREEN;
-  return IDR_OTR_ICON;
-}
-
 bool BrowserView::ShouldShowAvatar() const {
 #if defined(OS_CHROMEOS)
   if (!browser_->is_type_tabbed() && !browser_->is_app())
     return false;
   // Don't show incognito avatar in the guest session.
   if (IsOffTheRecord() && !IsGuestSession())
     return true;
   // This function is called via BrowserNonClientFrameView::UpdateAvatarInfo
   // during the creation of the BrowserWindow, so browser->window() will not
   // yet be set. In this case we can safely return false.
@@ skipping 40 matching lines @@
 
 bool BrowserView::IsAcceleratorRegistered(const ui::Accelerator& accelerator) {
   return accelerator_table_.find(accelerator) != accelerator_table_.end();
 }
 
 WebContents* BrowserView::GetActiveWebContents() const {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 gfx::ImageSkia BrowserView::GetOTRAvatarIcon() const {
-  return *GetThemeProvider()->GetImageSkiaNamed(GetOTRIconResourceID());
+  return *GetThemeProvider()->GetImageSkiaNamed(IDR_OTR_ICON);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindow implementation:
 
 void BrowserView::Show() {
   // If the window is already visible, just activate it.
   if (frame_->IsVisible()) {
     frame_->Activate();
     return;
@@ skipping 1909 matching lines @@
       !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
     gfx::Point icon_bottom(
         toolbar_->location_bar()->GetLocationBarAnchorPoint());
     ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }