Revert 141573 - Update use of OTR avatars for touch. We now select

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/managed_mode.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 34 matching lines @@
   gfx::Image avatar;
   string16 text;
   bool is_gaia_picture = false;
   if (browser_view_->IsGuestSession()) {
 #if defined(OS_CHROMEOS)
     avatar = rb.GetImageNamed(IDR_GUEST_ICON);
 #else
     NOTREACHED();
 #endif
   } else if (browser_view_->IsOffTheRecord()) {
-    avatar = rb.GetImageNamed(browser_view_->GetOTRIconResourceID());
+    avatar = rb.GetImageNamed(IDR_OTR_ICON);
   } else if (ManagedMode::IsInManagedMode()) {
     avatar = rb.GetImageNamed(IDR_MANAGED_MODE_AVATAR);
   } else if (AvatarMenuModel::ShouldShowAvatarMenu()) {
     ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     Profile* profile = browser_view_->browser()->profile();
     size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
     if (index == std::string::npos)
       return;
     is_gaia_picture =
@@ skipping 20 matching lines @@
 
 void BrowserNonClientFrameView::VisibilityChanged(views::View* starting_from,
                                                   bool is_visible) {
   if (!is_visible)
     return;
   // The first time UpdateAvatarInfo() is called the window is not visible so
   // DrawTaskBarDecoration() has no effect. Therefore we need to call it again
   // once the window is visible.
   UpdateAvatarInfo();
 }