Remove touch layout

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

 // Copyright (c) 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_non_client_frame_view.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
@@ skipping 77 matching lines @@
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::Image avatar;
   gfx::Image taskbar_badge_avatar;
   base::string16 text;
   bool is_rectangle = false;
   if (browser_view_->IsGuestSession()) {
     avatar = rb.
         GetImageNamed(profiles::GetPlaceholderAvatarIconResourceID());
   } else if (browser_view_->IsOffTheRecord()) {
-    avatar = rb.GetImageNamed(browser_view_->GetOTRIconResourceID());
+    avatar = rb.GetImageNamed(IDR_OTR_ICON);
     // TODO(nkostylev): Allow this on ChromeOS once the ChromeOS test
     // environment handles profile directories correctly.
 #if !defined(OS_CHROMEOS)
     bool is_badge_rectangle = false;
     // The taskbar badge should be the profile avatar, not the OTR avatar.
     AvatarMenu::GetImageForMenuButton(browser_view_->browser()->profile(),
                                       &taskbar_badge_avatar,
                                       &is_badge_rectangle);
 #endif
   } else if (avatar_button_ || AvatarMenu::ShouldShowAvatarMenu()) {
@@ skipping 49 matching lines @@
       new_avatar_button_->set_id(VIEW_ID_NEW_AVATAR_BUTTON);
       AddChildView(new_avatar_button_);
       frame_->GetRootView()->Layout();
     }
   } else if (new_avatar_button_) {
     delete new_avatar_button_;
     new_avatar_button_ = NULL;
     frame_->GetRootView()->Layout();
   }
 }