Show avatar icon on V2 app's frame

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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_ash.h"
 
 #include "ash/ash_switches.h"
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/frame_border_hit_test_controller.h"
 #include "ash/frame/header_painter.h"
@@ skipping 383 matching lines @@
   // Non streamlined hosted apps do not have a toolbar or tabstrip. Their header
   // should look the same as the header for packaged apps. Streamlined hosted
   // apps have a toolbar so should use the browser header style.
   return browser_view()->browser()->is_app() &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableStreamlinedHostedApps);
 }
 
 void BrowserNonClientFrameViewAsh::LayoutAvatar() {
   DCHECK(avatar_button());
+#if !defined(OS_CHROMEOS)
+  // ChromeOS shows avatar on V1 app.
   DCHECK(browser_view()->IsTabStripVisible());
+#endif
   gfx::ImageSkia incognito_icon = browser_view()->GetOTRAvatarIcon();
 
   int avatar_bottom = GetTopInset() +
       browser_view()->GetTabStripHeight() - kAvatarBottomSpacing;
   int avatar_restored_y = avatar_bottom - incognito_icon.height();
   int avatar_y = (frame()->IsMaximized() || frame()->IsFullscreen()) ?
       GetTopInset() + kContentShadowHeight : avatar_restored_y;
 
   // Hide the incognito icon in immersive fullscreen when the tab light bar is
   // visible because the header is too short for the icognito icon to be
@@ skipping 164 matching lines @@
 }
 
 int BrowserNonClientFrameViewAsh::GetFrameImageIdForHostedApp() const {
   if (UsePackagedAppHeaderStyle()) {
     return ShouldPaintAsActive() ?
         IDR_AURA_WINDOW_HEADER_BASE_ACTIVE :
         IDR_AURA_WINDOW_HEADER_BASE_INACTIVE;
   }
   return GetFrameImageIdForBrowserPopup();
 }