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 537 matching lines @@
 }
 
 bool BrowserView::IsGuestSession() const {
   return browser_->profile()->IsGuestSession();
 }
 
 bool BrowserView::IsRegularOrGuestSession() const {
   return profiles::IsRegularOrGuestSession(browser_.get());
 }
 
 int BrowserView::GetOTRIconResourceID() const {

[sky, 2014/04/24 03:29:02]

Can you remove this function and replace with IDR_OTR_ICON.

[oshima, 2014/04/25 14:16:26]

Done.

-  if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH && IsFullscreen())
-    return IDR_OTR_ICON_FULLSCREEN;
   return IDR_OTR_ICON;
 }
 
 int BrowserView::GetGuestIconResourceID() const {
   return IDR_LOGIN_GUEST;
 }
 
 bool BrowserView::ShouldShowAvatar() const {
 #if defined(OS_CHROMEOS)
   if (!browser_->is_type_tabbed() && !browser_->is_app())
@@ skipping 1985 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;
 }