Show avatar icon on V2 app's frame

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 568 matching lines @@
   }
 
   return otr_resource_id;
 }
 
 int BrowserView::GetGuestIconResourceID() const {
   return IDR_LOGIN_GUEST;
 }
 
 bool BrowserView::ShouldShowAvatar() const {
-  if (!IsBrowserTypeNormal())
+#if defined(OS_CHROMEOS)
+  // Cros shows the avatar on both browser and v1 app.
+  if (!browser_->is_type_tabbed() && !browser_->is_app())
     return false;
-#if defined(OS_CHROMEOS)
+  // Don't show incognito avatar in the geust 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.
   if (!browser_->window())
     return false;
   return chrome::MultiUserWindowManager::ShouldShowAvatar(
       browser_->window()->GetNativeWindow());
 #else
+  if (!IsBrowserTypeNormal())
+    return false;
   if (IsOffTheRecord())  // Desktop guest is incognito and needs avatar.
     return true;
   // Tests may not have a profile manager.
   if (!g_browser_process->profile_manager())
     return false;
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   if (cache.GetIndexOfProfileWithPath(browser_->profile()->GetPath()) ==
       std::string::npos) {
     return false;
@@ skipping 1946 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;
 }